From c6d158a8e3656c6483f9b006e11a718f0a79835a Mon Sep 17 00:00:00 2001
From: Greg Utas <greg@pentennea.com>
Date: Tue, 26 Jul 2022 12:05:09 -0400
Subject: [PATCH] Update output files.

---
 output/rsc.check.txt   |   1 -
 output/rsc.lib.txt     | 214 ++++++++++++++++++++---------------------
 output/rsc.xref.txt    |   2 +-
 src/ct/CodeWarning.cpp |   2 +-
 4 files changed, 109 insertions(+), 110 deletions(-)

diff --git a/output/rsc.check.txt b/output/rsc.check.txt
index dc6bbf45..1d41d9c6 100644
--- a/output/rsc.check.txt
+++ b/output/rsc.check.txt
@@ -1,4 +1,3 @@
-
 WARNING COUNTS (* if supported by >fix)
   W004   140  C-style cast
   W005    58  Functional cast
diff --git a/output/rsc.lib.txt b/output/rsc.lib.txt
index e6cd6276..c5f8df19 100644
--- a/output/rsc.lib.txt
+++ b/output/rsc.lib.txt
@@ -14771,7 +14771,7 @@ namespace ::
                   warnings.push_back(&log);
                }
             }
-            *stream << CRLF << "WARNING COUNTS (* if supported by >fix)" << CRLF;
+            *stream << "WARNING COUNTS (* if supported by >fix)" << CRLF;
             for(auto /* int */ w = 0; w < Warning_N; ++w) // i=1 r=7 w=1 
             {
                if(WarningCounts_[w] != 0)
@@ -58592,7 +58592,7 @@ namespace ::
       fixed_string CoutTextStr = "cout"; // i=1 r=1 w=0 NbIncrement.cpp
       static Mutex CoutThreadMsgQLock_("CoutThreadMsgQLock"); // i=1 r=1 w=1 CoutThread.cpp
       extern fixed_string CreateStreamFailure = "Could not create output stream."; // i=1 r=15 w=0 NbCliParms.h & NbCliParms.cpp
-      constexpr char CRLF = '\n'; // i=1 r=4225 w=0 SysTypes.h
+      constexpr char CRLF = '\n'; // i=1 r=4223 w=0 SysTypes.h
       extern fixed_string CRLF_STR = "\n"; // i=1 r=8 w=0 SysTypes.h & SysTypes.cpp
       static SteadyTime::Point CurrIntervalStart_ = SteadyTime::GetInvalid(); // i=1 r=3 w=1 Thread.cpp
       static size_t CurrLine_ = 0; // i=1 r=3 w=2 CfgParmRegistry.cpp
@@ -113018,7 +113018,7 @@ namespace ::
          public: basic_ostream& seekp(streampos pos); // c=0 
          public: basic_ostream& seekp(streampos offset, basic_ios::seekdir dir); // c=0 
          public: basic_ostream& operator<<(bool b); // c=158 
-         public: basic_ostream& operator<<(char c); // c=2589 
+         public: basic_ostream& operator<<(char c); // c=2588 
          public: basic_ostream& operator<<(unsigned char uc); // c=9 
          public: basic_ostream& operator<<(short s); // c=3 
          public: basic_ostream& operator<<(unsigned short us); // c=111 
@@ -132703,14 +132703,14 @@ cb/BcProtocol.cpp
       return new CliText(CipTbcFactoryExpl, CipTbcFactoryStr);
    }
    CallBase::CipCpgSignal* NodeBase::Singleton<CallBase::CipCpgSignal>::Instance_ = nullptr; // i=1 r=11 w=2 
+   CallBase::CipRelSignal* NodeBase::Singleton<CallBase::CipRelSignal>::Instance_ = nullptr; // i=1 r=11 w=2 
    CallBase::CipIamSignal* NodeBase::Singleton<CallBase::CipIamSignal>::Instance_ = nullptr; // i=1 r=11 w=2 
    CallBase::CipAnmSignal* NodeBase::Singleton<CallBase::CipAnmSignal>::Instance_ = nullptr; // i=1 r=11 w=2 
-   CallBase::CipRelSignal* NodeBase::Singleton<CallBase::CipRelSignal>::Instance_ = nullptr; // i=1 r=11 w=2 
-   CallBase::CipTcpService* NodeBase::Singleton<CallBase::CipTcpService>::Instance_ = nullptr; // i=1 r=11 w=2 
    CallBase::CipUdpService* NodeBase::Singleton<CallBase::CipUdpService>::Instance_ = nullptr; // i=1 r=11 w=2 
-   CallBase::CipCauseParameter* NodeBase::Singleton<CallBase::CipCauseParameter>::Instance_ = nullptr; // i=1 r=11 w=2 
-   CallBase::CipRouteParameter* NodeBase::Singleton<CallBase::CipRouteParameter>::Instance_ = nullptr; // i=1 r=11 w=2 
+   CallBase::CipTcpService* NodeBase::Singleton<CallBase::CipTcpService>::Instance_ = nullptr; // i=1 r=11 w=2 
    CallBase::CipMediaParameter* NodeBase::Singleton<CallBase::CipMediaParameter>::Instance_ = nullptr; // i=1 r=11 w=2 
+   CallBase::CipRouteParameter* NodeBase::Singleton<CallBase::CipRouteParameter>::Instance_ = nullptr; // i=1 r=11 w=2 
+   CallBase::CipCauseParameter* NodeBase::Singleton<CallBase::CipCauseParameter>::Instance_ = nullptr; // i=1 r=11 w=2 
    CallBase::CipCalledParameter* NodeBase::Singleton<CallBase::CipCalledParameter>::Instance_ = nullptr; // i=1 r=11 w=2 
    CallBase::CipCallingParameter* NodeBase::Singleton<CallBase::CipCallingParameter>::Instance_ = nullptr; // i=1 r=11 w=2 
    CallBase::CipProgressParameter* NodeBase::Singleton<CallBase::CipProgressParameter>::Instance_ = nullptr; // i=1 r=11 w=2 
@@ -133192,11 +133192,11 @@ cb/BcService.cpp
    fixed_string CallBase::BcCollectionTimeoutEventStr = "BcCollectionTimeoutEvent"; // i=1 r=1 w=0 
    fixed_string CallBase::BcLocalInformationEventStr = "BcLocalInformationEvent"; // i=1 r=1 w=0 
    fixed_string CallBase::BcAnalyzeInformationEventStr = "BcAnalyzeInformationEvent"; // i=1 r=1 w=0 
-   CallBase::BcPcAnalyzeRemoteMessage* NodeBase::Singleton<CallBase::BcPcAnalyzeRemoteMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
    CallBase::BcOaAnalyzeRemoteMessage* NodeBase::Singleton<CallBase::BcOaAnalyzeRemoteMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
    CallBase::BcNuAnalyzeRemoteMessage* NodeBase::Singleton<CallBase::BcNuAnalyzeRemoteMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
-   CallBase::BcScAnalyzeRemoteMessage* NodeBase::Singleton<CallBase::BcScAnalyzeRemoteMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
+   CallBase::BcPcAnalyzeRemoteMessage* NodeBase::Singleton<CallBase::BcPcAnalyzeRemoteMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
    CallBase::BcAcAnalyzeRemoteMessage* NodeBase::Singleton<CallBase::BcAcAnalyzeRemoteMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
+   CallBase::BcScAnalyzeRemoteMessage* NodeBase::Singleton<CallBase::BcScAnalyzeRemoteMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
    fixed_string CallBase::BcInvalidInformationEventStr = "BcInvalidInformationEvent"; // i=1 r=1 w=0 
    fixed_string CallBase::BcSelectRouteEventStr = "BcSelectRouteEvent"; // i=1 r=1 w=0 
    fixed_string CallBase::BcAuthorizeCallSetupEventStr = "BcAuthorizeCallSetupEvent"; // i=1 r=1 w=0 
@@ -145732,7 +145732,7 @@ ct/CodeWarning.cpp
 #include "Lexer.h"
 #include "Singleton.h"
 #include "ThisThread.h"
-   using namespace NodeBase; // u=48 FunctionGuard.h
+   using namespace NodeBase; // u=47 FunctionGuard.h
    using std::ostream; // u=3 iosfwd
    using std::setw; // u=3 iomanip
    using std::string; // u=15 string
@@ -145836,7 +145836,7 @@ ct/CodeWarning.cpp
             warnings.push_back(&log);
          }
       }
-      *stream << CRLF << "WARNING COUNTS (* if supported by >fix)" << CRLF;
+      *stream << "WARNING COUNTS (* if supported by >fix)" << CRLF;
       for(auto /* int */ w = 0; w < Warning_N; ++w) // i=1 r=7 w=1 
       {
          if(WarningCounts_[w] != 0)
@@ -197400,13 +197400,13 @@ mb/MbModule.cpp
       reg->BindSymbol("port.roh", Tone::ReceiverOffHook);
       reg->BindSymbol("port.held", Tone::Held);
    }
+   MediaBase::ToneDial* NodeBase::Singleton<MediaBase::ToneDial>::Instance_ = nullptr; // i=1 r=11 w=2 
    MediaBase::ToneBusy* NodeBase::Singleton<MediaBase::ToneBusy>::Instance_ = nullptr; // i=1 r=11 w=2 
    MediaBase::ToneHeld* NodeBase::Singleton<MediaBase::ToneHeld>::Instance_ = nullptr; // i=1 r=11 w=2 
-   MediaBase::ToneDial* NodeBase::Singleton<MediaBase::ToneDial>::Instance_ = nullptr; // i=1 r=11 w=2 
    MediaBase::ToneSilent* NodeBase::Singleton<MediaBase::ToneSilent>::Instance_ = nullptr; // i=1 r=11 w=2 
    MediaBase::ToneReorder* NodeBase::Singleton<MediaBase::ToneReorder>::Instance_ = nullptr; // i=1 r=11 w=2 
-   MediaBase::ToneRegistry* NodeBase::Singleton<MediaBase::ToneRegistry>::Instance_ = nullptr; // i=1 r=11 w=2 
    MediaBase::ToneRingback* NodeBase::Singleton<MediaBase::ToneRingback>::Instance_ = nullptr; // i=1 r=11 w=2 
+   MediaBase::ToneRegistry* NodeBase::Singleton<MediaBase::ToneRegistry>::Instance_ = nullptr; // i=1 r=11 w=2 
    MediaBase::MediaEndptPool* NodeBase::Singleton<MediaBase::MediaEndptPool>::Instance_ = nullptr; // i=1 r=11 w=2 
    MediaBase::ToneCallWaiting* NodeBase::Singleton<MediaBase::ToneCallWaiting>::Instance_ = nullptr; // i=1 r=11 w=2 
    MediaBase::ToneConfirmation* NodeBase::Singleton<MediaBase::ToneConfirmation>::Instance_ = nullptr; // i=1 r=11 w=2 
@@ -208839,11 +208839,11 @@ nb/NbSignals.cpp
       Singleton<SigDeleted>::Instance();
    }
    NodeBase::SigWrite* NodeBase::Singleton<NodeBase::SigWrite>::Instance_ = nullptr; // i=1 r=11 w=2 
-   NodeBase::SigClose* NodeBase::Singleton<NodeBase::SigClose>::Instance_ = nullptr; // i=1 r=11 w=2 
-   NodeBase::SigYield* NodeBase::Singleton<NodeBase::SigYield>::Instance_ = nullptr; // i=1 r=11 w=2 
    NodeBase::SigPurge* NodeBase::Singleton<NodeBase::SigPurge>::Instance_ = nullptr; // i=1 r=11 w=2 
-   NodeBase::SigStack2* NodeBase::Singleton<NodeBase::SigStack2>::Instance_ = nullptr; // i=1 r=11 w=2 
+   NodeBase::SigYield* NodeBase::Singleton<NodeBase::SigYield>::Instance_ = nullptr; // i=1 r=11 w=2 
+   NodeBase::SigClose* NodeBase::Singleton<NodeBase::SigClose>::Instance_ = nullptr; // i=1 r=11 w=2 
    NodeBase::SigStack1* NodeBase::Singleton<NodeBase::SigStack1>::Instance_ = nullptr; // i=1 r=11 w=2 
+   NodeBase::SigStack2* NodeBase::Singleton<NodeBase::SigStack2>::Instance_ = nullptr; // i=1 r=11 w=2 
    NodeBase::SigDeleted* NodeBase::Singleton<NodeBase::SigDeleted>::Instance_ = nullptr; // i=1 r=11 w=2 
    class NodeBase::SigWrite : public NodeBase::PosixSignal
    {
@@ -209061,8 +209061,8 @@ nb/NbTracer.cpp
       buff->SetFilter(TraceThread);
       return TraceOk;
    }
-   NodeBase::MemoryTraceTool* NodeBase::Singleton<NodeBase::MemoryTraceTool>::Instance_ = nullptr; // i=1 r=11 w=2 
    NodeBase::TraceBufferTool* NodeBase::Singleton<NodeBase::TraceBufferTool>::Instance_ = nullptr; // i=1 r=11 w=2 
+   NodeBase::MemoryTraceTool* NodeBase::Singleton<NodeBase::MemoryTraceTool>::Instance_ = nullptr; // i=1 r=11 w=2 
    NodeBase::FunctionTraceTool* NodeBase::Singleton<NodeBase::FunctionTraceTool>::Instance_ = nullptr; // i=1 r=11 w=2 
    fixed_string NodeBase::TraceBufferToolName = "ToolBuffer"; // i=1 r=1 w=0 
    fixed_string NodeBase::TraceBufferToolExpl = "internal use"; // i=1 r=1 w=0 
@@ -210957,8 +210957,8 @@ nt/NtIncrement.cpp
    NodeTools::NtIncrement::~NtIncrement() { Debug::ftnt("NtIncrement.dtor"); } // c=1 
    NodeTools::LbcPool* NodeBase::Singleton<NodeTools::LbcPool>::Instance_ = nullptr; // i=1 r=11 w=2 
    NodeTools::TestSlab* NodeBase::Singleton<NodeTools::TestSlab>::Instance_ = nullptr; // i=1 r=11 w=2 
-   NodeTools::TestBuddy* NodeBase::Singleton<NodeTools::TestBuddy>::Instance_ = nullptr; // i=1 r=11 w=2 
    NodeTools::Q1WayPool* NodeBase::Singleton<NodeTools::Q1WayPool>::Instance_ = nullptr; // i=1 r=11 w=2 
+   NodeTools::TestBuddy* NodeBase::Singleton<NodeTools::TestBuddy>::Instance_ = nullptr; // i=1 r=11 w=2 
    NodeTools::Q2WayPool* NodeBase::Singleton<NodeTools::Q2WayPool>::Instance_ = nullptr; // i=1 r=11 w=2 
    NodeTools::RegistryPool* NodeBase::Singleton<NodeTools::RegistryPool>::Instance_ = nullptr; // i=1 r=11 w=2 
    fixed_string NodeTools::FreeqOffsetExpl = "offset into free queue (0 = head)"; // i=1 r=1 w=0 
@@ -215091,7 +215091,7 @@ subs/ostream
       public: basic_ostream& seekp(streampos pos); // c=0 
       public: basic_ostream& seekp(streampos offset, basic_ios::seekdir dir); // c=0 
       public: basic_ostream& operator<<(bool b); // c=158 
-      public: basic_ostream& operator<<(char c); // c=2589 
+      public: basic_ostream& operator<<(char c); // c=2588 
       public: basic_ostream& operator<<(unsigned char uc); // c=9 
       public: basic_ostream& operator<<(short s); // c=3 
       public: basic_ostream& operator<<(unsigned short us); // c=111 
@@ -218884,17 +218884,17 @@ pb/PbModule.cpp
    }
    PotsBase::PotsProtocol* NodeBase::Singleton<PotsBase::PotsProtocol>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsIncrement* NodeBase::Singleton<PotsBase::PotsIncrement>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsTwcFeature* NodeBase::Singleton<PotsBase::PotsTwcFeature>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsCxfFeature* NodeBase::Singleton<PotsBase::PotsCxfFeature>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsHtlFeature* NodeBase::Singleton<PotsBase::PotsHtlFeature>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsSusFeature* NodeBase::Singleton<PotsBase::PotsSusFeature>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsCfnFeature* NodeBase::Singleton<PotsBase::PotsCfnFeature>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsWmlFeature* NodeBase::Singleton<PotsBase::PotsWmlFeature>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsTwcFeature* NodeBase::Singleton<PotsBase::PotsTwcFeature>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsBicFeature* NodeBase::Singleton<PotsBase::PotsBicFeature>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsCfbFeature* NodeBase::Singleton<PotsBase::PotsCfbFeature>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsBocFeature* NodeBase::Singleton<PotsBase::PotsBocFeature>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsCfuFeature* NodeBase::Singleton<PotsBase::PotsCfuFeature>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsHtlFeature* NodeBase::Singleton<PotsBase::PotsHtlFeature>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsCfbFeature* NodeBase::Singleton<PotsBase::PotsCfbFeature>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsCfnFeature* NodeBase::Singleton<PotsBase::PotsCfnFeature>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsCwtFeature* NodeBase::Singleton<PotsBase::PotsCwtFeature>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsCxfFeature* NodeBase::Singleton<PotsBase::PotsCxfFeature>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsBocFeature* NodeBase::Singleton<PotsBase::PotsBocFeature>::Instance_ = nullptr; // i=1 r=11 w=2 
 }
 pb/PbModule.h
 {
@@ -220592,71 +220592,71 @@ sn/PotsBcService.cpp
    PotsBase::PotsBcNull* NodeBase::Singleton<PotsBase::PotsBcNull>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsBcActive* NodeBase::Singleton<PotsBase::PotsBcActive>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsBcException* NodeBase::Singleton<PotsBase::PotsBcException>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsLocalBusySap* NodeBase::Singleton<PotsBase::PotsLocalBusySap>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsBcScSendCall* NodeBase::Singleton<PotsBase::PotsBcScSendCall>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsLocalBusySap* NodeBase::Singleton<PotsBase::PotsLocalBusySap>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsBcSfLocalBusy* NodeBase::Singleton<PotsBase::PotsBcSfLocalBusy>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsBcSendingCall* NodeBase::Singleton<PotsBase::PotsBcSendingCall>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsBcLocalAnswer* NodeBase::Singleton<PotsBase::PotsBcLocalAnswer>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsBcNuOriginate* NodeBase::Singleton<PotsBase::PotsBcNuOriginate>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsBcNuTerminate* NodeBase::Singleton<PotsBase::PotsBcNuTerminate>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsBcReleaseCall* NodeBase::Singleton<PotsBase::PotsBcReleaseCall>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsBcSendingCall* NodeBase::Singleton<PotsBase::PotsBcSendingCall>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsBcReleaseUser* NodeBase::Singleton<PotsBase::PotsBcReleaseUser>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsBcLocalAnswer* NodeBase::Singleton<PotsBase::PotsBcLocalAnswer>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsBcSfLocalBusy* NodeBase::Singleton<PotsBase::PotsBcSfLocalBusy>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsBcTermAlerting* NodeBase::Singleton<PotsBase::PotsBcTermAlerting>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsBcLocalRelease* NodeBase::Singleton<PotsBase::PotsBcLocalRelease>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsBcScRemoteBusy* NodeBase::Singleton<PotsBase::PotsBcScRemoteBusy>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsBcOrigAlerting* NodeBase::Singleton<PotsBase::PotsBcOrigAlerting>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsBcTermAlerting* NodeBase::Singleton<PotsBase::PotsBcTermAlerting>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsBcRemoteAnswer* NodeBase::Singleton<PotsBase::PotsBcRemoteAnswer>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsBcScRemoteBusy* NodeBase::Singleton<PotsBase::PotsBcScRemoteBusy>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsBcLocalRelease* NodeBase::Singleton<PotsBase::PotsBcLocalRelease>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsBcSrSelectRoute* NodeBase::Singleton<PotsBase::PotsBcSrSelectRoute>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsBcPcPresentCall* NodeBase::Singleton<PotsBase::PotsBcPcPresentCall>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsBcLsLocalResume* NodeBase::Singleton<PotsBase::PotsBcLsLocalResume>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsBcPcPresentCall* NodeBase::Singleton<PotsBase::PotsBcPcPresentCall>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsBcSrSelectRoute* NodeBase::Singleton<PotsBase::PotsBcSrSelectRoute>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsBcAcLocalSuspend* NodeBase::Singleton<PotsBase::PotsBcAcLocalSuspend>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsBcPresentingCall* NodeBase::Singleton<PotsBase::PotsBcPresentingCall>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsBcSelectingRoute* NodeBase::Singleton<PotsBase::PotsBcSelectingRoute>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsBcRsRemoteResume* NodeBase::Singleton<PotsBase::PotsBcRsRemoteResume>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsBcSelectingRoute* NodeBase::Singleton<PotsBase::PotsBcSelectingRoute>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsLocalAlertingSnp* NodeBase::Singleton<PotsBase::PotsLocalAlertingSnp>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsBcAcLocalSuspend* NodeBase::Singleton<PotsBase::PotsBcAcLocalSuspend>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsBcLocalSuspending* NodeBase::Singleton<PotsBase::PotsBcLocalSuspending>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsBcPcLocalAlerting* NodeBase::Singleton<PotsBase::PotsBcPcLocalAlerting>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsBcLsRemoteRelease* NodeBase::Singleton<PotsBase::PotsBcLsRemoteRelease>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsBcScRemoteRelease* NodeBase::Singleton<PotsBase::PotsBcScRemoteRelease>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsBcPcRemoteRelease* NodeBase::Singleton<PotsBase::PotsBcPcRemoteRelease>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsBcAcRemoteSuspend* NodeBase::Singleton<PotsBase::PotsBcAcRemoteSuspend>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsBcTaRemoteRelease* NodeBase::Singleton<PotsBase::PotsBcTaRemoteRelease>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsBcLsRemoteRelease* NodeBase::Singleton<PotsBase::PotsBcLsRemoteRelease>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsBcScRemoteRelease* NodeBase::Singleton<PotsBase::PotsBcScRemoteRelease>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsBcPcLocalAlerting* NodeBase::Singleton<PotsBase::PotsBcPcLocalAlerting>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsBcTaLocalNoAnswer* NodeBase::Singleton<PotsBase::PotsBcTaLocalNoAnswer>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsBcAcRemoteSuspend* NodeBase::Singleton<PotsBase::PotsBcAcRemoteSuspend>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsBcRemoteSuspending* NodeBase::Singleton<PotsBase::PotsBcRemoteSuspending>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsBcScRemoteAlerting* NodeBase::Singleton<PotsBase::PotsBcScRemoteAlerting>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsBcLocalSuspending* NodeBase::Singleton<PotsBase::PotsBcLocalSuspending>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsBcScRemoteProgress* NodeBase::Singleton<PotsBase::PotsBcScRemoteProgress>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsBcSfSelectFacility* NodeBase::Singleton<PotsBase::PotsBcSfSelectFacility>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsBcScRemoteAlerting* NodeBase::Singleton<PotsBase::PotsBcScRemoteAlerting>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsBcOaRemoteNoAnswer* NodeBase::Singleton<PotsBase::PotsBcOaRemoteNoAnswer>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsBcSfSelectFacility* NodeBase::Singleton<PotsBase::PotsBcSfSelectFacility>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsBcRemoteSuspending* NodeBase::Singleton<PotsBase::PotsBcRemoteSuspending>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsBcExApplyTreatment* NodeBase::Singleton<PotsBase::PotsBcExApplyTreatment>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsBcSelectingFacility* NodeBase::Singleton<PotsBase::PotsBcSelectingFacility>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsBcPcFacilityFailure* NodeBase::Singleton<PotsBase::PotsBcPcFacilityFailure>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsBcSelectingFacility* NodeBase::Singleton<PotsBase::PotsBcSelectingFacility>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsBcCiLocalInformation* NodeBase::Singleton<PotsBase::PotsBcCiLocalInformation>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsBcAoOriginationDenied* NodeBase::Singleton<PotsBase::PotsBcAoOriginationDenied>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsBcAtTerminationDenied* NodeBase::Singleton<PotsBase::PotsBcAtTerminationDenied>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsCollectInformationSap* NodeBase::Singleton<PotsBase::PotsCollectInformationSap>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsBcCiCollectionTimeout* NodeBase::Singleton<PotsBase::PotsBcCiCollectionTimeout>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsBcAnalyzingInformation* NodeBase::Singleton<PotsBase::PotsBcAnalyzingInformation>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsBcAuthorizingCallSetup* NodeBase::Singleton<PotsBase::PotsBcAuthorizingCallSetup>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsBcAsAuthorizeCallSetup* NodeBase::Singleton<PotsBase::PotsBcAsAuthorizeCallSetup>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsBcAiInvalidInformation* NodeBase::Singleton<PotsBase::PotsBcAiInvalidInformation>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsCollectInformationSap* NodeBase::Singleton<PotsBase::PotsCollectInformationSap>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsBcCiCollectInformation* NodeBase::Singleton<PotsBase::PotsBcCiCollectInformation>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsBcAiInvalidInformation* NodeBase::Singleton<PotsBase::PotsBcAiInvalidInformation>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsBcAiAnalyzeInformation* NodeBase::Singleton<PotsBase::PotsBcAiAnalyzeInformation>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsBcAoAnalyzeLocalMessage* NodeBase::Singleton<PotsBase::PotsBcAoAnalyzeLocalMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsBcAuthorizingCallSetup* NodeBase::Singleton<PotsBase::PotsBcAuthorizingCallSetup>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsBcAsAuthorizeCallSetup* NodeBase::Singleton<PotsBase::PotsBcAsAuthorizeCallSetup>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsBcAnalyzingInformation* NodeBase::Singleton<PotsBase::PotsBcAnalyzingInformation>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsBcNuAnalyzeLocalMessage* NodeBase::Singleton<PotsBase::PotsBcNuAnalyzeLocalMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsBcCollectingInformation* NodeBase::Singleton<PotsBase::PotsBcCollectingInformation>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsAuthorizeTerminationSap* NodeBase::Singleton<PotsBase::PotsAuthorizeTerminationSap>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsBcTaAnalyzeLocalMessage* NodeBase::Singleton<PotsBase::PotsBcTaAnalyzeLocalMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsBcAcAnalyzeLocalMessage* NodeBase::Singleton<PotsBase::PotsBcAcAnalyzeLocalMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsBcExAnalyzeLocalMessage* NodeBase::Singleton<PotsBase::PotsBcExAnalyzeLocalMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsBcScAnalyzeLocalMessage* NodeBase::Singleton<PotsBase::PotsBcScAnalyzeLocalMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsBcCiAnalyzeLocalMessage* NodeBase::Singleton<PotsBase::PotsBcCiAnalyzeLocalMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsBcCollectingInformation* NodeBase::Singleton<PotsBase::PotsBcCollectingInformation>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsBcSfAnalyzeLocalMessage* NodeBase::Singleton<PotsBase::PotsBcSfAnalyzeLocalMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsBcPcAnalyzeLocalMessage* NodeBase::Singleton<PotsBase::PotsBcPcAnalyzeLocalMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsBcTaAnalyzeLocalMessage* NodeBase::Singleton<PotsBase::PotsBcTaAnalyzeLocalMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsBcAoAnalyzeLocalMessage* NodeBase::Singleton<PotsBase::PotsBcAoAnalyzeLocalMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsAuthorizeOriginationSap* NodeBase::Singleton<PotsBase::PotsAuthorizeOriginationSap>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsBcSfAnalyzeLocalMessage* NodeBase::Singleton<PotsBase::PotsBcSfAnalyzeLocalMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsBcCiAnalyzeLocalMessage* NodeBase::Singleton<PotsBase::PotsBcCiAnalyzeLocalMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsBcAuthorizingTermination* NodeBase::Singleton<PotsBase::PotsBcAuthorizingTermination>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsBcAuthorizingOrigination* NodeBase::Singleton<PotsBase::PotsBcAuthorizingOrigination>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsBcAoAuthorizeOrigination* NodeBase::Singleton<PotsBase::PotsBcAoAuthorizeOrigination>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsAuthorizeTerminationSap* NodeBase::Singleton<PotsBase::PotsAuthorizeTerminationSap>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsBcExAnalyzeLocalMessage* NodeBase::Singleton<PotsBase::PotsBcExAnalyzeLocalMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsBcAtAuthorizeTermination* NodeBase::Singleton<PotsBase::PotsBcAtAuthorizeTermination>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsBcAoAuthorizeOrigination* NodeBase::Singleton<PotsBase::PotsBcAoAuthorizeOrigination>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsBcAuthorizingOrigination* NodeBase::Singleton<PotsBase::PotsBcAuthorizingOrigination>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsBcAuthorizingTermination* NodeBase::Singleton<PotsBase::PotsBcAuthorizingTermination>::Instance_ = nullptr; // i=1 r=11 w=2 
 }
 sn/PotsBcSsm.cpp
 {
@@ -223008,8 +223008,8 @@ sn/PotsCfxService.cpp
    PotsBase::PotsCfbTiming* NodeBase::Singleton<PotsBase::PotsCfbTiming>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsCfbTiTimeout* NodeBase::Singleton<PotsBase::PotsCfbTiTimeout>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsCfuActivating* NodeBase::Singleton<PotsBase::PotsCfuActivating>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsCfbTiAnalyzeMessage* NodeBase::Singleton<PotsBase::PotsCfbTiAnalyzeMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsCfxUnAnalyzeMessage* NodeBase::Singleton<PotsBase::PotsCfxUnAnalyzeMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsCfbTiAnalyzeMessage* NodeBase::Singleton<PotsBase::PotsCfbTiAnalyzeMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
    fixed_string PotsBase::PotsCfbTimeoutEventStr = "PotsCfbTimeoutEvent"; // i=1 r=1 w=0 
    fn_name PotsBase::PotsCfxSsm_ProcessSip = "PotsCfxSsm.ProcessSip"; // i=1 r=2 w=0 
    class PotsBase::PotsCfxState : public SessionBase::State
@@ -224617,17 +224617,17 @@ sn/PotsCwmService.cpp
    PotsBase::PotsCwmAcRelay* NodeBase::Singleton<PotsBase::PotsCwmAcRelay>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsCwmAcNotify* NodeBase::Singleton<PotsBase::PotsCwmAcNotify>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsCwmAcQuiesce* NodeBase::Singleton<PotsBase::PotsCwmAcQuiesce>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsCwmAcReanswer* NodeBase::Singleton<PotsBase::PotsCwmAcReanswer>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsCwmAcFlipflop* NodeBase::Singleton<PotsBase::PotsCwmAcFlipflop>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsCwmInitiating* NodeBase::Singleton<PotsBase::PotsCwmInitiating>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsCwmInFacility* NodeBase::Singleton<PotsBase::PotsCwmInFacility>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsCwmAcRenotify* NodeBase::Singleton<PotsBase::PotsCwmAcRenotify>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsCwmAcReanswer* NodeBase::Singleton<PotsBase::PotsCwmAcReanswer>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsCwmAcFlipflop* NodeBase::Singleton<PotsBase::PotsCwmAcFlipflop>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsCwmAcReconnect* NodeBase::Singleton<PotsBase::PotsCwmAcReconnect>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsCwmAcToneTimeout* NodeBase::Singleton<PotsBase::PotsCwmAcToneTimeout>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsCwmAcLocalRelease* NodeBase::Singleton<PotsBase::PotsCwmAcLocalRelease>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsCwmAcActiveRelease* NodeBase::Singleton<PotsBase::PotsCwmAcActiveRelease>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsCwmAcInactiveRelease* NodeBase::Singleton<PotsBase::PotsCwmAcInactiveRelease>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsCwmAcReanswerTimeout* NodeBase::Singleton<PotsBase::PotsCwmAcReanswerTimeout>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsCwmAcInactiveRelease* NodeBase::Singleton<PotsBase::PotsCwmAcInactiveRelease>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsCwmAcAnalyzeUserMessage* NodeBase::Singleton<PotsBase::PotsCwmAcAnalyzeUserMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsCwmInAnalyzeNetworkMessage* NodeBase::Singleton<PotsBase::PotsCwmInAnalyzeNetworkMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsCwmAcAnalyzeNetworkMessage* NodeBase::Singleton<PotsBase::PotsCwmAcAnalyzeNetworkMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
@@ -225560,14 +225560,14 @@ sn/PotsCwtService.cpp
       pssm.SetNextSnp(BcTrigger::PresentCallSnp);
       return Suspend;
    }
-   PotsBase::PotsCwaNull* NodeBase::Singleton<PotsBase::PotsCwaNull>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsCwbNull* NodeBase::Singleton<PotsBase::PotsCwbNull>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsCwaNull* NodeBase::Singleton<PotsBase::PotsCwaNull>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsCwtPeAck* NodeBase::Singleton<PotsBase::PotsCwtPeAck>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsCwaActive* NodeBase::Singleton<PotsBase::PotsCwaActive>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsCwbActive* NodeBase::Singleton<PotsBase::PotsCwbActive>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsCwbPending* NodeBase::Singleton<PotsBase::PotsCwbPending>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsCwtAcRelease* NodeBase::Singleton<PotsBase::PotsCwtAcRelease>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsCwtPeRelease* NodeBase::Singleton<PotsBase::PotsCwtPeRelease>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsCwtAcRelease* NodeBase::Singleton<PotsBase::PotsCwtAcRelease>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsCwtPrPresentCall* NodeBase::Singleton<PotsBase::PotsCwtPrPresentCall>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsCwtAcAnalyzeUserMessage* NodeBase::Singleton<PotsBase::PotsCwtAcAnalyzeUserMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsCwtPeAnalyzeUserMessage* NodeBase::Singleton<PotsBase::PotsCwtPeAnalyzeUserMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
@@ -227753,8 +227753,8 @@ sn/PotsMultiplexer.cpp
       return mux.RelayMsg();
    }
    PotsBase::PotsMuxNull* NodeBase::Singleton<PotsBase::PotsMuxNull>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsMuxPaRelay* NodeBase::Singleton<PotsBase::PotsMuxPaRelay>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsMuxPassive* NodeBase::Singleton<PotsBase::PotsMuxPassive>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsMuxPaRelay* NodeBase::Singleton<PotsBase::PotsMuxPaRelay>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsMuxNuInitiate* NodeBase::Singleton<PotsBase::PotsMuxNuInitiate>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsMuxPaAnalyzeUserMessage* NodeBase::Singleton<PotsBase::PotsMuxPaAnalyzeUserMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsMuxPaAnalyzeNetworkMessage* NodeBase::Singleton<PotsBase::PotsMuxPaAnalyzeNetworkMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
@@ -228715,23 +228715,23 @@ pb/PotsProtocol.cpp
       stream << prefix << "flash  : " << flash << CRLF;
    }
    PotsBase::PotsFlashSignal* NodeBase::Singleton<PotsBase::PotsFlashSignal>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsOnhookSignal* NodeBase::Singleton<PotsBase::PotsOnhookSignal>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsDigitsSignal* NodeBase::Singleton<PotsBase::PotsDigitsSignal>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsOnhookSignal* NodeBase::Singleton<PotsBase::PotsOnhookSignal>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsOffhookSignal* NodeBase::Singleton<PotsBase::PotsOffhookSignal>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsLockoutSignal* NodeBase::Singleton<PotsBase::PotsLockoutSignal>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsReleaseSignal* NodeBase::Singleton<PotsBase::PotsReleaseSignal>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsScanParameter* NodeBase::Singleton<PotsBase::PotsScanParameter>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsOffhookSignal* NodeBase::Singleton<PotsBase::PotsOffhookSignal>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsRingParameter* NodeBase::Singleton<PotsBase::PotsRingParameter>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsProgressSignal* NodeBase::Singleton<PotsBase::PotsProgressSignal>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsFacilitySignal* NodeBase::Singleton<PotsBase::PotsFacilitySignal>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsAlertingSignal* NodeBase::Singleton<PotsBase::PotsAlertingSignal>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsMediaParameter* NodeBase::Singleton<PotsBase::PotsMediaParameter>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsFacilitySignal* NodeBase::Singleton<PotsBase::PotsFacilitySignal>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsProgressSignal* NodeBase::Singleton<PotsBase::PotsProgressSignal>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsCauseParameter* NodeBase::Singleton<PotsBase::PotsCauseParameter>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsDigitsParameter* NodeBase::Singleton<PotsBase::PotsDigitsParameter>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsMediaParameter* NodeBase::Singleton<PotsBase::PotsMediaParameter>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsSuperviseSignal* NodeBase::Singleton<PotsBase::PotsSuperviseSignal>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsHeaderParameter* NodeBase::Singleton<PotsBase::PotsHeaderParameter>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsProgressParameter* NodeBase::Singleton<PotsBase::PotsProgressParameter>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsDigitsParameter* NodeBase::Singleton<PotsBase::PotsDigitsParameter>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsFacilityParameter* NodeBase::Singleton<PotsBase::PotsFacilityParameter>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsProgressParameter* NodeBase::Singleton<PotsBase::PotsProgressParameter>::Instance_ = nullptr; // i=1 r=11 w=2 
    fixed_string PotsBase::AlertingTextStr = "A"; // i=1 r=1 w=0 
    fixed_string PotsBase::AlertingTextExpl = "alerting"; // i=1 r=1 w=0 
    fixed_string PotsBase::DigitsTextStr = "D"; // i=1 r=1 w=0 
@@ -229762,39 +229762,39 @@ sn/PotsProxySessions.cpp
    PotsBase::PotsProxyActive* NodeBase::Singleton<PotsBase::PotsProxyActive>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsProxyException* NodeBase::Singleton<PotsBase::PotsProxyException>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsProxyScSendCall* NodeBase::Singleton<PotsBase::PotsProxyScSendCall>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsProxyNuOriginate* NodeBase::Singleton<PotsBase::PotsProxyNuOriginate>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsProxySendingCall* NodeBase::Singleton<PotsBase::PotsProxySendingCall>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsProxyReleaseCall* NodeBase::Singleton<PotsBase::PotsProxyReleaseCall>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsProxyLocalAnswer* NodeBase::Singleton<PotsBase::PotsProxyLocalAnswer>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsProxyLocalRelease* NodeBase::Singleton<PotsBase::PotsProxyLocalRelease>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsProxyOrigAlerting* NodeBase::Singleton<PotsBase::PotsProxyOrigAlerting>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsProxyReleaseCall* NodeBase::Singleton<PotsBase::PotsProxyReleaseCall>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsProxySendingCall* NodeBase::Singleton<PotsBase::PotsProxySendingCall>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsProxyNuOriginate* NodeBase::Singleton<PotsBase::PotsProxyNuOriginate>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsProxyTermAlerting* NodeBase::Singleton<PotsBase::PotsProxyTermAlerting>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsProxyOrigAlerting* NodeBase::Singleton<PotsBase::PotsProxyOrigAlerting>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsProxyLocalRelease* NodeBase::Singleton<PotsBase::PotsProxyLocalRelease>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsProxyRemoteAnswer* NodeBase::Singleton<PotsBase::PotsProxyRemoteAnswer>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsProxyLsLocalResume* NodeBase::Singleton<PotsBase::PotsProxyLsLocalResume>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsProxyRemoteRelease* NodeBase::Singleton<PotsBase::PotsProxyRemoteRelease>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsProxyLocalAlerting* NodeBase::Singleton<PotsBase::PotsProxyLocalAlerting>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsProxyLsLocalResume* NodeBase::Singleton<PotsBase::PotsProxyLsLocalResume>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsProxyPresentingCall* NodeBase::Singleton<PotsBase::PotsProxyPresentingCall>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsProxyAcLocalSuspend* NodeBase::Singleton<PotsBase::PotsProxyAcLocalSuspend>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsProxySelectingRoute* NodeBase::Singleton<PotsBase::PotsProxySelectingRoute>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsProxyPresentingCall* NodeBase::Singleton<PotsBase::PotsProxyPresentingCall>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsProxyRsRemoteResume* NodeBase::Singleton<PotsBase::PotsProxyRsRemoteResume>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsProxyAcLocalSuspend* NodeBase::Singleton<PotsBase::PotsProxyAcLocalSuspend>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsProxyLocalSuspending* NodeBase::Singleton<PotsBase::PotsProxyLocalSuspending>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsProxyPcLocalProgress* NodeBase::Singleton<PotsBase::PotsProxyPcLocalProgress>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsProxyAcRemoteSuspend* NodeBase::Singleton<PotsBase::PotsProxyAcRemoteSuspend>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsProxyPcLocalProgress* NodeBase::Singleton<PotsBase::PotsProxyPcLocalProgress>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsProxyRemoteSuspending* NodeBase::Singleton<PotsBase::PotsProxyRemoteSuspending>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsProxyScRemoteAlerting* NodeBase::Singleton<PotsBase::PotsProxyScRemoteAlerting>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsProxyScRemoteProgress* NodeBase::Singleton<PotsBase::PotsProxyScRemoteProgress>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsProxySelectingFacility* NodeBase::Singleton<PotsBase::PotsProxySelectingFacility>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsProxyAuthorizingCallSetup* NodeBase::Singleton<PotsBase::PotsProxyAuthorizingCallSetup>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsProxyCiCollectInformation* NodeBase::Singleton<PotsBase::PotsProxyCiCollectInformation>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsProxyAnalyzingInformation* NodeBase::Singleton<PotsBase::PotsProxyAnalyzingInformation>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsProxyNuAnalyzeLocalMessage* NodeBase::Singleton<PotsBase::PotsProxyNuAnalyzeLocalMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsProxyScAnalyzeLocalMessage* NodeBase::Singleton<PotsBase::PotsProxyScAnalyzeLocalMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsProxyCollectingInformation* NodeBase::Singleton<PotsBase::PotsProxyCollectingInformation>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsProxyCiCollectInformation* NodeBase::Singleton<PotsBase::PotsProxyCiCollectInformation>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsProxyAuthorizingCallSetup* NodeBase::Singleton<PotsBase::PotsProxyAuthorizingCallSetup>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsProxyPcAnalyzeLocalMessage* NodeBase::Singleton<PotsBase::PotsProxyPcAnalyzeLocalMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsProxyScAnalyzeLocalMessage* NodeBase::Singleton<PotsBase::PotsProxyScAnalyzeLocalMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsProxyAcAnalyzeLocalMessage* NodeBase::Singleton<PotsBase::PotsProxyAcAnalyzeLocalMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsProxyCollectingInformation* NodeBase::Singleton<PotsBase::PotsProxyCollectingInformation>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsProxyTaAnalyzeLocalMessage* NodeBase::Singleton<PotsBase::PotsProxyTaAnalyzeLocalMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsProxyAuthorizingOrigination* NodeBase::Singleton<PotsBase::PotsProxyAuthorizingOrigination>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsProxyNuAnalyzeLocalMessage* NodeBase::Singleton<PotsBase::PotsProxyNuAnalyzeLocalMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsProxyAuthorizingTermination* NodeBase::Singleton<PotsBase::PotsProxyAuthorizingTermination>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsProxyAuthorizingOrigination* NodeBase::Singleton<PotsBase::PotsProxyAuthorizingOrigination>::Instance_ = nullptr; // i=1 r=11 w=2 
 }
 sn/PotsProxySessions.h
 {
@@ -243185,11 +243185,11 @@ sb/Service.cpp
       states_.Erase(state);
    }
    fixed_string SessionBase::AnalyzeMsgEventStr = "AnalyzeMsgEvent"; // i=1 r=1 w=0 
-   SessionBase::SbAnalyzeSap* NodeBase::Singleton<SessionBase::SbAnalyzeSap>::Instance_ = nullptr; // i=1 r=11 w=2 
    SessionBase::SbAnalyzeSnp* NodeBase::Singleton<SessionBase::SbAnalyzeSnp>::Instance_ = nullptr; // i=1 r=11 w=2 
+   SessionBase::SbAnalyzeSap* NodeBase::Singleton<SessionBase::SbAnalyzeSap>::Instance_ = nullptr; // i=1 r=11 w=2 
    fixed_string SessionBase::AnalyzeSapEventStr = "AnalyzeSapEvent"; // i=1 r=1 w=0 
-   SessionBase::ServiceRegistry* NodeBase::Singleton<SessionBase::ServiceRegistry>::Instance_ = nullptr; // i=1 r=11 w=2 
    SessionBase::SbInitiationReq* NodeBase::Singleton<SessionBase::SbInitiationReq>::Instance_ = nullptr; // i=1 r=11 w=2 
+   SessionBase::ServiceRegistry* NodeBase::Singleton<SessionBase::ServiceRegistry>::Instance_ = nullptr; // i=1 r=11 w=2 
    SessionBase::SbAnalyzeMessage* NodeBase::Singleton<SessionBase::SbAnalyzeMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
    SessionBase::SbForceTransition* NodeBase::Singleton<SessionBase::SbForceTransition>::Instance_ = nullptr; // i=1 r=11 w=2 
    fixed_string SessionBase::AnalyzeSnpEventStr = "AnalyzeSnpEvent"; // i=1 r=1 w=0 
@@ -249874,25 +249874,25 @@ sn/SnModule.cpp
    }
    PotsBase::SnIncrement* NodeBase::Singleton<PotsBase::SnIncrement>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsBcService* NodeBase::Singleton<PotsBase::PotsBcService>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsCwbService* NodeBase::Singleton<PotsBase::PotsCwbService>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsMuxFactory* NodeBase::Singleton<PotsBase::PotsMuxFactory>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsBicService* NodeBase::Singleton<PotsBase::PotsBicService>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsCfnService* NodeBase::Singleton<PotsBase::PotsCfnService>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsCfxService* NodeBase::Singleton<PotsBase::PotsCfxService>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsMuxService* NodeBase::Singleton<PotsBase::PotsMuxService>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsCfuService* NodeBase::Singleton<PotsBase::PotsCfuService>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsCfbService* NodeBase::Singleton<PotsBase::PotsCfbService>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsCcwService* NodeBase::Singleton<PotsBase::PotsCcwService>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsBocService* NodeBase::Singleton<PotsBase::PotsBocService>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsCwaService* NodeBase::Singleton<PotsBase::PotsCwaService>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsHtlService* NodeBase::Singleton<PotsBase::PotsHtlService>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsWmlService* NodeBase::Singleton<PotsBase::PotsWmlService>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsMuxService* NodeBase::Singleton<PotsBase::PotsMuxService>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsSusService* NodeBase::Singleton<PotsBase::PotsSusService>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsWmlService* NodeBase::Singleton<PotsBase::PotsWmlService>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsCcwService* NodeBase::Singleton<PotsBase::PotsCcwService>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsCfnService* NodeBase::Singleton<PotsBase::PotsCfnService>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsCwbService* NodeBase::Singleton<PotsBase::PotsCwbService>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsCfxService* NodeBase::Singleton<PotsBase::PotsCfxService>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsCwmService* NodeBase::Singleton<PotsBase::PotsCwmService>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsCfuService* NodeBase::Singleton<PotsBase::PotsCfuService>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsHtlService* NodeBase::Singleton<PotsBase::PotsHtlService>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsCfbService* NodeBase::Singleton<PotsBase::PotsCfbService>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsCallFactory* NodeBase::Singleton<PotsBase::PotsCallFactory>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsCfuActivate* NodeBase::Singleton<PotsBase::PotsCfuActivate>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsDiscService* NodeBase::Singleton<PotsBase::PotsDiscService>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsWmlActivate* NodeBase::Singleton<PotsBase::PotsWmlActivate>::Instance_ = nullptr; // i=1 r=11 w=2 
-   PotsBase::PotsCallFactory* NodeBase::Singleton<PotsBase::PotsCallFactory>::Instance_ = nullptr; // i=1 r=11 w=2 
+   PotsBase::PotsDiscService* NodeBase::Singleton<PotsBase::PotsDiscService>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsProxyService* NodeBase::Singleton<PotsBase::PotsProxyService>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsCallIpService* NodeBase::Singleton<PotsBase::PotsCallIpService>::Instance_ = nullptr; // i=1 r=11 w=2 
    PotsBase::PotsCfuDeactivate* NodeBase::Singleton<PotsBase::PotsCfuDeactivate>::Instance_ = nullptr; // i=1 r=11 w=2 
@@ -251762,9 +251762,9 @@ st/StModule.cpp
       auto* /* NodeBase::SymbolRegistry* */ reg = Singleton<SymbolRegistry>::Instance(); // i=1 r=1 w=1 
       reg->BindSymbol("factory.test", TestFactoryId);
    }
-   SessionTools::TestService* NodeBase::Singleton<SessionTools::TestService>::Instance_ = nullptr; // i=1 r=11 w=2 
-   SessionTools::TestFactory* NodeBase::Singleton<SessionTools::TestFactory>::Instance_ = nullptr; // i=1 r=11 w=2 
    SessionTools::StIncrement* NodeBase::Singleton<SessionTools::StIncrement>::Instance_ = nullptr; // i=1 r=11 w=2 
+   SessionTools::TestFactory* NodeBase::Singleton<SessionTools::TestFactory>::Instance_ = nullptr; // i=1 r=11 w=2 
+   SessionTools::TestService* NodeBase::Singleton<SessionTools::TestService>::Instance_ = nullptr; // i=1 r=11 w=2 
    SessionTools::TestProtocol* NodeBase::Singleton<SessionTools::TestProtocol>::Instance_ = nullptr; // i=1 r=11 w=2 
 }
 st/StModule.h
@@ -254047,9 +254047,9 @@ nb/SysSignals.cpp
       Singleton<SigSegv>::Instance();
       Singleton<SigTerm>::Instance();
    }
-   NodeBase::SigInt* NodeBase::Singleton<NodeBase::SigInt>::Instance_ = nullptr; // i=1 r=11 w=2 
    NodeBase::SigFpe* NodeBase::Singleton<NodeBase::SigFpe>::Instance_ = nullptr; // i=1 r=11 w=2 
    NodeBase::SigIll* NodeBase::Singleton<NodeBase::SigIll>::Instance_ = nullptr; // i=1 r=11 w=2 
+   NodeBase::SigInt* NodeBase::Singleton<NodeBase::SigInt>::Instance_ = nullptr; // i=1 r=11 w=2 
    NodeBase::SigTerm* NodeBase::Singleton<NodeBase::SigTerm>::Instance_ = nullptr; // i=1 r=11 w=2 
    NodeBase::SigSegv* NodeBase::Singleton<NodeBase::SigSegv>::Instance_ = nullptr; // i=1 r=11 w=2 
    NodeBase::SigAbort* NodeBase::Singleton<NodeBase::SigAbort>::Instance_ = nullptr; // i=1 r=11 w=2 
@@ -255963,7 +255963,7 @@ nb/SysTypes.h
    constexpr size_t NodeBase::COUT_LENGTH_MAX = 80; // i=1 r=11 w=0 
    constexpr char NodeBase::APOSTROPHE = '\''; // i=1 r=57 w=0 
    constexpr char NodeBase::BACKSLASH = '\\'; // i=1 r=16 w=0 
-   constexpr char NodeBase::CRLF = '\n'; // i=1 r=4225 w=0 
+   constexpr char NodeBase::CRLF = '\n'; // i=1 r=4223 w=0 
    constexpr char NodeBase::NUL = '\0'; // i=1 r=16 w=0 
    constexpr char NodeBase::QUOTE = '"'; // i=1 r=73 w=0 
    constexpr char NodeBase::SPACE = ' '; // i=1 r=550 w=0 
@@ -257638,9 +257638,9 @@ st/TestSessions.cpp
    SessionTools::TestNull* NodeBase::Singleton<SessionTools::TestNull>::Instance_ = nullptr; // i=1 r=11 w=2 
    SessionTools::TestActive* NodeBase::Singleton<SessionTools::TestActive>::Instance_ = nullptr; // i=1 r=11 w=2 
    SessionTools::TestAcVerify* NodeBase::Singleton<SessionTools::TestAcVerify>::Instance_ = nullptr; // i=1 r=11 w=2 
-   SessionTools::TestNuInject* NodeBase::Singleton<SessionTools::TestNuInject>::Instance_ = nullptr; // i=1 r=11 w=2 
    SessionTools::TestNuVerify* NodeBase::Singleton<SessionTools::TestNuVerify>::Instance_ = nullptr; // i=1 r=11 w=2 
    SessionTools::TestAcInject* NodeBase::Singleton<SessionTools::TestAcInject>::Instance_ = nullptr; // i=1 r=11 w=2 
+   SessionTools::TestNuInject* NodeBase::Singleton<SessionTools::TestNuInject>::Instance_ = nullptr; // i=1 r=11 w=2 
    SessionTools::TestInjectSignal* NodeBase::Singleton<SessionTools::TestInjectSignal>::Instance_ = nullptr; // i=1 r=11 w=2 
    SessionTools::TestAnalyzeUserMessage* NodeBase::Singleton<SessionTools::TestAnalyzeUserMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
    SessionTools::TestAnalyzeNetworkMessage* NodeBase::Singleton<SessionTools::TestAnalyzeNetworkMessage>::Instance_ = nullptr; // i=1 r=11 w=2 
diff --git a/output/rsc.xref.txt b/output/rsc.xref.txt
index 70a8e66a..3e3b20e1 100644
--- a/output/rsc.xref.txt
+++ b/output/rsc.xref.txt
@@ -58233,8 +58233,8 @@ sb/SbEvents.h
       sb/SbEvents.h
    SessionBase.AnalyzeSnpEvent.~AnalyzeSnpEvent: 243 [Function]
       sb/AnalyzeSnpEvent.cpp
-   SessionBase.Event: 223 [Friend]
    SessionBase.Event: 82 [Friend]
+   SessionBase.Event: 223 [Friend]
    SessionBase.ForceTransitionEvent: 301 [Class]
       sb/ForceTransitionEvent.cpp
       sb/SbHandlers.cpp
diff --git a/src/ct/CodeWarning.cpp b/src/ct/CodeWarning.cpp
index e9194332..3a080819 100644
--- a/src/ct/CodeWarning.cpp
+++ b/src/ct/CodeWarning.cpp
@@ -221,7 +221,7 @@ void CodeWarning::GenerateReport(ostream* stream, const LibItemSet& files)
 
    //  Display the total number of warnings of each type.
    //
-   *stream << CRLF << "WARNING COUNTS (* if supported by >fix)" << CRLF;
+   *stream << "WARNING COUNTS (* if supported by >fix)" << CRLF;
 
    for(auto w = 0; w < Warning_N; ++w)
    {