diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index eef678b36d..a1aa74cab9 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -244,10 +244,8 @@ namespace NifOsg
                 osg::ref_ptr<NifOsg::KeyframeController> callback(new NifOsg::KeyframeController(key->data.getPtr()));
                 callback->setFunction(std::shared_ptr<NifOsg::ControllerFunction>(new NifOsg::ControllerFunction(key)));
 
-                if (target.mKeyframeControllers.find(strdata->string) != target.mKeyframeControllers.end())
+                if (!target.mKeyframeControllers.emplace(strdata->string, callback).second)
                     Log(Debug::Verbose) << "Controller " << strdata->string << " present more than once in " << nif->getFilename() << ", ignoring later version";
-                else
-                    target.mKeyframeControllers[strdata->string] = callback;
             }
         }
 
diff --git a/components/sceneutil/visitor.cpp b/components/sceneutil/visitor.cpp
index 3c3559a083..876ea920fa 100644
--- a/components/sceneutil/visitor.cpp
+++ b/components/sceneutil/visitor.cpp
@@ -61,10 +61,7 @@ namespace SceneUtil
     {
         // Take transformation for first found node in file
         const std::string nodeName = Misc::StringUtils::lowerCase(trans.getName());
-        if (mMap.find(nodeName) == mMap.end())
-        {
-            mMap[nodeName] = &trans;
-        }
+        mMap.emplace(nodeName, &trans);
 
         traverse(trans);
     }