diff --git a/extras/Projucer/Source/Project/Modules/jucer_AvailableModulesList.h b/extras/Projucer/Source/Project/Modules/jucer_AvailableModulesList.h
index e364ea59ac..e1494dd014 100644
--- a/extras/Projucer/Source/Project/Modules/jucer_AvailableModulesList.h
+++ b/extras/Projucer/Source/Project/Modules/jucer_AvailableModulesList.h
@@ -131,8 +131,8 @@ private:
             ModuleDescription m (path);
 
             if (m.isValid()
-                && std::find_if (list.begin(), list.end(),
-                                 [&m] (const ModuleIDAndFolder& element) { return element.first == m.getID(); }) == std::end (list))
+                && std::none_of (list.begin(), list.end(),
+                                 [&m] (const ModuleIDAndFolder& element) { return element.first == m.getID(); }))
             {
                 list.push_back ({ m.getID(), path });
                 return true;
diff --git a/extras/Projucer/Source/Project/UI/jucer_ProjectMessagesComponent.h b/extras/Projucer/Source/Project/UI/jucer_ProjectMessagesComponent.h
index 860c29fce1..a7b60e63e3 100644
--- a/extras/Projucer/Source/Project/UI/jucer_ProjectMessagesComponent.h
+++ b/extras/Projucer/Source/Project/UI/jucer_ProjectMessagesComponent.h
@@ -299,42 +299,34 @@ private:
                 return true;
             };
 
-            messages.erase (std::remove_if (std::begin (messages), std::end (messages), removePredicate),
-                                            std::end (messages));
+            messages.erase (std::remove_if (messages.begin(), messages.end(), removePredicate),
+                                            messages.end());
 
-            for (int i = 0; i < warningsTree.getNumChildren(); ++i)
+            for (auto* tree : { &warningsTree, &notificationsTree })
             {
-                auto child = warningsTree.getChild (i);
-
-                if (! child.getProperty (ProjectMessages::Ids::isVisible))
-                    continue;
-
-                if (std::find_if (std::begin (messages), std::end (messages),
-                                  [child] (const std::unique_ptr<MessageComponent>& messageComponent) { return messageComponent->message == child.getType(); })
-                    == std::end (messages))
+                for (int i = 0; i < tree->getNumChildren(); ++i)
                 {
-                    messages.push_back (std::make_unique<MessageComponent> (*this, child.getType(), project.getMessageActions (child.getType())));
-                    addAndMakeVisible (*messages.back());
+                    auto child = tree->getChild (i);
+
+                    if (! child.getProperty (ProjectMessages::Ids::isVisible))
+                        continue;
+
+                    const auto messageMatchesType = [&child] (const auto& messageComponent)
+                    {
+                        return messageComponent->message == child.getType();
+                    };
+
+                    if (std::none_of (messages.begin(), messages.end(), messageMatchesType))
+                    {
+                        messages.push_back (std::make_unique<MessageComponent> (*this,
+                                                                                child.getType(),
+                                                                                project.getMessageActions (child.getType())));
+                        addAndMakeVisible (*messages.back());
+                    }
                 }
             }
 
-            for (int i = 0; i < notificationsTree.getNumChildren(); ++i)
-            {
-                auto child = notificationsTree.getChild (i);
-
-                if (! child.getProperty (ProjectMessages::Ids::isVisible))
-                    continue;
-
-                if (std::find_if (std::begin (messages), std::end (messages),
-                                  [child] (const std::unique_ptr<MessageComponent>& messageComponent) { return messageComponent->message == child.getType(); })
-                    == std::end (messages))
-                {
-                    messages.push_back (std::make_unique<MessageComponent> (*this, child.getType(), project.getMessageActions (child.getType())));
-                    addAndMakeVisible (*messages.back());
-                }
-            }
-
-            auto isNowShowing = (messages.size() > 0);
+            const auto isNowShowing = (messages.size() > 0);
 
             owner.updateBounds (isNowShowing != listWasShowing);
             updateSize (owner.getWidth());
diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp
index 015ba6bbbf..497b6a8bca 100644
--- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp
+++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp
@@ -225,10 +225,7 @@ String ProjectExporter::getUniqueName() const
         return defaultBuildsRootFolder + info.targetFolder == targetLocationString;
     };
 
-    auto iter = std::find_if (typeInfos.begin(), typeInfos.end(),
-                              std::move (predicate));
-
-    if (iter == typeInfos.end())
+    if (std::none_of (typeInfos.begin(), typeInfos.end(), std::move (predicate)))
         return name + " - " + targetLocationString;
 
     return name;
diff --git a/modules/juce_events/timers/juce_Timer.cpp b/modules/juce_events/timers/juce_Timer.cpp
index e1c3459e03..52e12919b0 100644
--- a/modules/juce_events/timers/juce_Timer.cpp
+++ b/modules/juce_events/timers/juce_Timer.cpp
@@ -186,8 +186,8 @@ private:
     {
         // Trying to add a timer that's already here - shouldn't get to this point,
         // so if you get this assertion, let me know!
-        jassert (std::find_if (timers.begin(), timers.end(),
-                               [t] (TimerCountdown i) { return i.timer == t; }) == timers.end());
+        jassert (std::none_of (timers.begin(), timers.end(),
+                               [t] (TimerCountdown i) { return i.timer == t; }));
 
         auto pos = timers.size();