diff --git a/src/sst/core/elemLoader.cc b/src/sst/core/elemLoader.cc
index f5c3f50b4..8674a5b5e 100644
--- a/src/sst/core/elemLoader.cc
+++ b/src/sst/core/elemLoader.cc
@@ -230,7 +230,7 @@ ElemLoader::loadLibrary(const std::string& elemlib, std::ostream& err_os)
                 // loop all the elements in the element lib
                 for ( auto& elempair : libpair.second ) {
                     // loop all the loaders in the element
-                    for ( auto* loader : elempair.second ) {
+                    for ( auto& loader : elempair.second ) {
                         loader->load();
                     }
                 }
diff --git a/src/sst/core/eli/elementbuilder.h b/src/sst/core/eli/elementbuilder.h
index 13c721e78..76887c871 100644
--- a/src/sst/core/eli/elementbuilder.h
+++ b/src/sst/core/eli/elementbuilder.h
@@ -37,14 +37,7 @@ class BuilderLibrary
 
     BuilderLibrary(const std::string& name) : name_(name) {}
 
-    BaseBuilder* getBuilder(const std::string& name)
-    {
-        auto iter = factories_.find(name);
-        if ( iter == factories_.end() ) { return nullptr; }
-        else {
-            return iter->second;
-        }
-    }
+    BaseBuilder* getBuilder(const std::string& name) { return factories_[name]; }
 
     const std::map<std::string, BaseBuilder*>& getMap() const { return factories_; }
 
@@ -87,29 +80,16 @@ class BuilderLibraryDatabase
 
     static Library* getLibrary(const std::string& name)
     {
-        if ( !libraries ) { libraries = new std::map<std::string, Library*>; }
-        auto iter = libraries->find(name);
-        if ( iter == libraries->end() ) {
-            auto* info         = new Library(name);
-            (*libraries)[name] = info;
-            return info;
-        }
-        else {
-            return iter->second;
-        }
+        static Map libraries; // Database
+        auto&      lib = libraries[name];
+        if ( !lib ) lib = new Library(name);
+        return lib;
     }
 
     template <class NewBase>
     using ChangeBase = BuilderLibraryDatabase<NewBase, CtorArgs...>;
-
-private:
-    // Database - needs to be a pointer for static init order
-    static Map* libraries;
 };
 
-template <class Base, class... CtorArgs>
-typename BuilderLibraryDatabase<Base, CtorArgs...>::Map* BuilderLibraryDatabase<Base, CtorArgs...>::libraries = nullptr;
-
 template <class Base, class Builder, class... CtorArgs>
 struct BuilderLoader : public LibraryLoader
 {
@@ -146,12 +126,9 @@ struct InstantiateBuilder
 {
     static bool isLoaded() { return loaded; }
 
-    static const bool loaded;
+    static inline const bool loaded = Base::Ctor::template add<T>();
 };
 
-template <class Base, class T>
-const bool InstantiateBuilder<Base, T>::loaded = Base::Ctor::template add<T>();
-
 template <class Base, class T, class Enable = void>
 struct Allocator
 {
@@ -168,14 +145,10 @@ struct CachedAllocator
     template <class... Args>
     Base* operator()(Args&&... ctorArgs)
     {
-        if ( !cached_ ) { cached_ = new T(std::forward<Args>(ctorArgs)...); }
-        return cached_;
+        static T* cached = new T(std::forward<Args>(ctorArgs)...);
+        return cached;
     }
-
-    static Base* cached_;
 };
-template <class Base, class T>
-Base* CachedAllocator<Base, T>::cached_ = nullptr;
 
 template <class T, class Base, class... Args>
 struct DerivedBuilder : public Builder<Base, Args...>
diff --git a/src/sst/core/eli/elementinfo.h b/src/sst/core/eli/elementinfo.h
index 71d846a71..5d087f48a 100644
--- a/src/sst/core/eli/elementinfo.h
+++ b/src/sst/core/eli/elementinfo.h
@@ -59,10 +59,8 @@ class DataBase
 public:
     static T* get(const std::string& elemlib, const std::string& elem)
     {
-        if ( !infos_ ) return nullptr;
-
-        auto libiter = infos_->find(elemlib);
-        if ( libiter != infos_->end() ) {
+        auto libiter = infos().find(elemlib);
+        if ( libiter != infos().end() ) {
             auto& submap   = libiter->second;
             auto  elemiter = submap.find(elem);
             if ( elemiter != submap.end() ) { return elemiter->second; }
@@ -70,21 +68,15 @@ class DataBase
         return nullptr;
     }
 
-    static void add(const std::string& elemlib, const std::string& elem, T* info)
-    {
-        if ( !infos_ ) {
-            infos_ = std::unique_ptr<std::map<std::string, std::map<std::string, T*>>>(
-                new std::map<std::string, std::map<std::string, T*>>);
-        }
-
-        (*infos_)[elemlib][elem] = info;
-    }
+    static void add(const std::string& elemlib, const std::string& elem, T* info) { infos()[elemlib][elem] = info; }
 
 private:
-    static std::unique_ptr<std::map<std::string, std::map<std::string, T*>>> infos_;
+    static std::map<std::string, std::map<std::string, T*>>& infos()
+    {
+        static std::map<std::string, std::map<std::string, T*>> infos_;
+        return infos_;
+    }
 };
-template <class T>
-std::unique_ptr<std::map<std::string, std::map<std::string, T*>>> DataBase<T>::infos_;
 
 template <class Policy, class... Policies>
 class BuilderInfoImpl : public Policy, public BuilderInfoImpl<Policies...>
@@ -208,9 +200,9 @@ class InfoLibraryDatabase
 
         std::vector<std::string> ret;
         // First iterate over libraries
-        for ( auto x : (*libraries) ) {
-            for ( auto& y : x.second->getMap() ) {
-                ret.push_back(x.first + "." + y.first);
+        for ( auto& [name, lib] : libraries() ) {
+            for ( auto& [elemlib, info] : lib->getMap() ) {
+                ret.push_back(name + "." + elemlib);
             }
         }
         return ret;
@@ -218,26 +210,20 @@ class InfoLibraryDatabase
 
     static Library* getLibrary(const std::string& name)
     {
-        if ( !libraries ) { libraries = new Map; }
-        auto iter = libraries->find(name);
-        if ( iter == libraries->end() ) {
-            auto* info         = new Library(name);
-            (*libraries)[name] = info;
-            return info;
-        }
-        else {
-            return iter->second;
-        }
+        auto& lib = libraries()[name];
+        if ( !lib ) lib = new Library(name);
+        return lib;
     }
 
 private:
-    // Database - needs to be a pointer for static init order
-    static Map* libraries;
+    // Database
+    static Map& libraries()
+    {
+        static Map libs;
+        return libs;
+    }
 };
 
-template <class Base>
-typename InfoLibraryDatabase<Base>::Map* InfoLibraryDatabase<Base>::libraries = nullptr;
-
 template <class Base, class Info>
 struct InfoLoader : public LibraryLoader
 {
diff --git a/src/sst/core/eli/elibase.cc b/src/sst/core/eli/elibase.cc
index 54df12df1..892bce120 100644
--- a/src/sst/core/eli/elibase.cc
+++ b/src/sst/core/eli/elibase.cc
@@ -19,32 +19,16 @@ namespace SST::ELI {
   BaseElementInfo class functions
 **************************************************************************/
 
-std::unique_ptr<LoadedLibraries::LibraryMap> LoadedLibraries::loaders_ {};
-
 bool
 LoadedLibraries::addLoader(
     const std::string& lib, const std::string& name, const std::string& alias, LibraryLoader* loader)
 {
-    if ( !loaders_ ) { loaders_ = std::unique_ptr<LibraryMap>(new LibraryMap); }
-    (*loaders_)[lib][name].push_back(loader);
-    if ( !alias.empty() ) (*loaders_)[lib][alias].push_back(loader);
-    return true;
-}
+    std::shared_ptr<LibraryLoader> shared_loader(loader);
 
-const LoadedLibraries::LibraryMap&
-LoadedLibraries::getLoaders()
-{
-    if ( !loaders_ ) { loaders_ = std::unique_ptr<LibraryMap>(new LibraryMap); }
-    return *loaders_;
-}
-
-bool
-LoadedLibraries::isLoaded(const std::string& name)
-{
-    if ( loaders_ ) { return loaders_->find(name) != loaders_->end(); }
-    else {
-        return false; // nothing loaded yet
-    }
+    auto& library = getLoaders()[lib];
+    if ( !alias.empty() && alias != name ) library[alias].push_back(shared_loader);
+    library[name].push_back(std::move(shared_loader));
+    return true;
 }
 
 } // namespace SST::ELI
diff --git a/src/sst/core/eli/elibase.h b/src/sst/core/eli/elibase.h
index 717045755..4ea757b31 100644
--- a/src/sst/core/eli/elibase.h
+++ b/src/sst/core/eli/elibase.h
@@ -16,11 +16,9 @@
 
 #include <algorithm>
 #include <cstring>
-#include <functional>
-#include <list>
+#include <deque>
 #include <map>
 #include <memory>
-#include <set>
 #include <string>
 #include <type_traits>
 #include <vector>
@@ -124,28 +122,27 @@ combineEliInfo(std::vector<T>& base, const std::vector<T>& add)
 
 struct LibraryLoader
 {
-    virtual void load() = 0;
-    virtual ~LibraryLoader() {}
+    virtual void load()      = 0;
+    virtual ~LibraryLoader() = default;
 };
 
 class LoadedLibraries
 {
 public:
-    using InfoMap    = std::map<std::string, std::list<LibraryLoader*>>;
+    using InfoMap    = std::map<std::string, std::deque<std::shared_ptr<LibraryLoader>>>;
     using LibraryMap = std::map<std::string, InfoMap>;
 
-    static bool isLoaded(const std::string& name);
+    static bool isLoaded(const std::string& name) { return getLoaders().count(name) != 0; }
 
-    /**
-       @return A boolean indicated successfully added
-    */
+    // @return A boolean indicated successfully added
     static bool
     addLoader(const std::string& lib, const std::string& name, const std::string& alias, LibraryLoader* loader);
 
-    static const LibraryMap& getLoaders();
-
-private:
-    static std::unique_ptr<LibraryMap> loaders_;
+    static LibraryMap& getLoaders()
+    {
+        static LibraryMap loaders;
+        return loaders;
+    }
 };
 
 // Template used to get aliases.  Needed because the ELI_getAlias()