diff --git a/extras/Introjucer/Source/Project/jucer_Module.cpp b/extras/Introjucer/Source/Project/jucer_Module.cpp
index cccfe55383..18d41d6413 100644
--- a/extras/Introjucer/Source/Project/jucer_Module.cpp
+++ b/extras/Introjucer/Source/Project/jucer_Module.cpp
@@ -479,8 +479,8 @@ File LibraryModule::getLocalFolderFor (Project& project) const
 {
     if (project.shouldCopyModuleFilesLocally (getID()).getValue())
         return project.getGeneratedCodeFolder().getChildFile ("modules").getChildFile (getID());
-    else
-        return moduleFolder;
+
+    return moduleFolder;
 }
 
 void LibraryModule::prepareExporter (ProjectExporter& exporter, ProjectSaver& projectSaver) const
diff --git a/extras/Introjucer/Source/Project/jucer_Project.cpp b/extras/Introjucer/Source/Project/jucer_Project.cpp
index 1bab65ca9c..7b380343ae 100644
--- a/extras/Introjucer/Source/Project/jucer_Project.cpp
+++ b/extras/Introjucer/Source/Project/jucer_Project.cpp
@@ -517,16 +517,16 @@ String Project::Item::getFilePath() const
 {
     if (isFile())
         return state [Ids::file].toString();
-    else
-        return String::empty;
+
+    return String::empty;
 }
 
 File Project::Item::getFile() const
 {
     if (isFile())
         return project.resolveFilename (state [Ids::file].toString());
-    else
-        return File::nonexistent;
+
+    return File::nonexistent;
 }
 
 void Project::Item::setFile (const File& file)
@@ -675,8 +675,8 @@ struct ItemSorterWithGroupsAtStart
 
         if (firstIsGroup == secondIsGroup)
             return first [Ids::name].toString().compareIgnoreCase (second [Ids::name].toString());
-        else
-            return firstIsGroup ? -1 : 1;
+
+        return firstIsGroup ? -1 : 1;
     }
 };
 
diff --git a/extras/Introjucer/Source/Utility/jucer_CodeHelpers.cpp b/extras/Introjucer/Source/Utility/jucer_CodeHelpers.cpp
index 1ce0fb4747..1c572b90ca 100644
--- a/extras/Introjucer/Source/Utility/jucer_CodeHelpers.cpp
+++ b/extras/Introjucer/Source/Utility/jucer_CodeHelpers.cpp
@@ -193,8 +193,8 @@ namespace CodeHelpers
     {
         if (includePath.startsWithChar ('<') || includePath.startsWithChar ('"'))
             return "#include " + includePath;
-        else
-            return "#include \"" + includePath + "\"";
+
+        return "#include \"" + includePath + "\"";
     }
 
     String makeHeaderGuardName (const File& file)
diff --git a/extras/Introjucer/Source/Utility/jucer_FileHelpers.cpp b/extras/Introjucer/Source/Utility/jucer_FileHelpers.cpp
index 18b38cc5be..af99bd087a 100644
--- a/extras/Introjucer/Source/Utility/jucer_FileHelpers.cpp
+++ b/extras/Introjucer/Source/Utility/jucer_FileHelpers.cpp
@@ -76,8 +76,8 @@ namespace FileHelpers
 
         if (file.exists())
             return file.replaceWithData (data, numBytes);
-        else
-            return file.appendData (data, numBytes);
+
+        return file.appendData (data, numBytes);
     }
 
     bool overwriteFileWithNewDataIfDifferent (const File& file, const MemoryOutputStream& newData)
diff --git a/extras/the jucer/src/model/jucer_JucerDocument.cpp b/extras/the jucer/src/model/jucer_JucerDocument.cpp
index af3d387d53..2bf99c5dd8 100644
--- a/extras/the jucer/src/model/jucer_JucerDocument.cpp	
+++ b/extras/the jucer/src/model/jucer_JucerDocument.cpp	
@@ -442,8 +442,8 @@ Result JucerDocument::saveDocument (const File& file)
 
     if (ok)
         return Result::ok();
-    else
-        return Result::fail (TRANS("Couldn't write to the file."));
+
+    return Result::fail (TRANS("Couldn't write to the file."));
 }
 
 //==============================================================================
diff --git a/extras/the jucer/src/utility/jucer_UtilityFunctions.cpp b/extras/the jucer/src/utility/jucer_UtilityFunctions.cpp
index dc672fecac..2327b32b46 100644
--- a/extras/the jucer/src/utility/jucer_UtilityFunctions.cpp	
+++ b/extras/the jucer/src/utility/jucer_UtilityFunctions.cpp	
@@ -148,8 +148,8 @@ const String quotedString (const String& s)
 
     if (CharPointer_ASCII::isValidString (s.toUTF8(), std::numeric_limits<int>::max()))
         return addEscapeChars (s).quoted();
-    else
-        return "CharPointer_UTF8 (" + addEscapeChars (s).quoted() + ")";
+
+    return "CharPointer_UTF8 (" + addEscapeChars (s).quoted() + ")";
 }
 
 const String replaceStringTranslations (String s, JucerDocument* document)
diff --git a/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp b/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp
index 8e2cb4b790..7503f87a79 100644
--- a/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp
+++ b/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp
@@ -900,8 +900,8 @@ public:
     {
         if (internal->inputDevice != 0)
             return internal->inputDevice->inChanNames;
-        else
-            return internal->inChanNames;
+
+        return internal->inChanNames;
     }
 
     bool isOpen()    { return isOpen_; }
diff --git a/modules/juce_audio_devices/native/juce_win32_AudioCDBurner.cpp b/modules/juce_audio_devices/native/juce_win32_AudioCDBurner.cpp
index 45ed0160b7..efb3a0b184 100644
--- a/modules/juce_audio_devices/native/juce_win32_AudioCDBurner.cpp
+++ b/modules/juce_audio_devices/native/juce_win32_AudioCDBurner.cpp
@@ -166,8 +166,8 @@ public:
 
         if (type == 0)
             return noDisc;
-        else
-            return readOnlyDiskPresent;
+
+        return readOnlyDiskPresent;
     }
 
     int getIntProperty (const LPOLESTR name, const int defaultReturn) const
diff --git a/modules/juce_audio_devices/sources/juce_AudioTransportSource.cpp b/modules/juce_audio_devices/sources/juce_AudioTransportSource.cpp
index a2c854f6ad..92691ac9fa 100644
--- a/modules/juce_audio_devices/sources/juce_AudioTransportSource.cpp
+++ b/modules/juce_audio_devices/sources/juce_AudioTransportSource.cpp
@@ -165,8 +165,8 @@ double AudioTransportSource::getCurrentPosition() const
 {
     if (sampleRate > 0.0)
         return getNextReadPosition() / sampleRate;
-    else
-        return 0.0;
+
+    return 0.0;
 }
 
 double AudioTransportSource::getLengthInSeconds() const
diff --git a/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm b/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm
index 4b1a301d96..1d30630167 100644
--- a/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm
+++ b/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm
@@ -1596,8 +1596,8 @@ bool AudioUnitPluginFormat::doesPluginStillExist (const PluginDescription& desc)
 {
     if (desc.fileOrIdentifier.startsWithIgnoreCase (AudioUnitFormatHelpers::auIdentifierPrefix))
         return fileMightContainThisPluginType (desc.fileOrIdentifier);
-    else
-        return File (desc.fileOrIdentifier).exists();
+
+    return File (desc.fileOrIdentifier).exists();
 }
 
 FileSearchPath AudioUnitPluginFormat::getDefaultLocationsToSearch()
diff --git a/modules/juce_core/containers/juce_SparseSet.h b/modules/juce_core/containers/juce_SparseSet.h
index db1d37e5e0..70586f459f 100644
--- a/modules/juce_core/containers/juce_SparseSet.h
+++ b/modules/juce_core/containers/juce_SparseSet.h
@@ -139,8 +139,8 @@ public:
         if (isPositiveAndBelow (rangeIndex, getNumRanges()))
             return Range<Type> (values.getUnchecked (rangeIndex << 1),
                                 values.getUnchecked ((rangeIndex << 1) + 1));
-        else
-            return Range<Type>();
+
+        return Range<Type>();
     }
 
     /** Returns the range between the lowest and highest values in the set.
diff --git a/modules/juce_core/files/juce_File.cpp b/modules/juce_core/files/juce_File.cpp
index 7d15844c8f..6d5a603240 100644
--- a/modules/juce_core/files/juce_File.cpp
+++ b/modules/juce_core/files/juce_File.cpp
@@ -286,10 +286,11 @@ String File::getPathUpToLastSlash() const
 
     if (lastSlash > 0)
         return fullPath.substring (0, lastSlash);
-    else if (lastSlash == 0)
+
+    if (lastSlash == 0)
         return separatorString;
-    else
-        return fullPath;
+
+    return fullPath;
 }
 
 File File::getParentDirectory() const
@@ -312,8 +313,8 @@ String File::getFileNameWithoutExtension() const
 
     if (lastDot > lastSlash)
         return fullPath.substring (lastSlash, lastDot);
-    else
-        return fullPath.substring (lastSlash);
+
+    return fullPath.substring (lastSlash);
 }
 
 bool File::isAChildOf (const File& potentialParent) const
diff --git a/modules/juce_core/maths/juce_Expression.cpp b/modules/juce_core/maths/juce_Expression.cpp
index b128da8edb..2e4e809fda 100644
--- a/modules/juce_core/maths/juce_Expression.cpp
+++ b/modules/juce_core/maths/juce_Expression.cpp
@@ -439,8 +439,8 @@ struct Expression::Helpers
         {
             if (input->getOperatorPrecedence() > 0)
                 return "-(" + input->toString() + ")";
-            else
-                return "-" + input->toString();
+
+            return "-" + input->toString();
         }
 
     private:
@@ -492,8 +492,8 @@ struct Expression::Helpers
 
             if (input == left)
                 return new Add (newDest, right->clone());
-            else
-                return new Subtract (left->clone(), newDest);
+
+            return new Subtract (left->clone(), newDest);
         }
 
     private:
@@ -545,8 +545,8 @@ struct Expression::Helpers
 
             if (input == left)
                 return new Multiply (newDest, right->clone());
-            else
-                return new Divide (left->clone(), newDest);
+
+            return new Divide (left->clone(), newDest);
         }
 
     private:
diff --git a/modules/juce_core/native/juce_win32_Files.cpp b/modules/juce_core/native/juce_win32_Files.cpp
index b3bd26e5df..f220a04f3f 100644
--- a/modules/juce_core/native/juce_win32_Files.cpp
+++ b/modules/juce_core/native/juce_win32_Files.cpp
@@ -480,8 +480,8 @@ bool File::isOnHardDisk() const
 
     if (fullPath.toLowerCase()[0] <= 'b' && fullPath[1] == ':')
         return n != DRIVE_REMOVABLE;
-    else
-        return n != DRIVE_CDROM && n != DRIVE_REMOTE;
+
+    return n != DRIVE_CDROM && n != DRIVE_REMOTE;
 }
 
 bool File::isOnRemovableDrive() const
diff --git a/modules/juce_core/network/juce_URL.cpp b/modules/juce_core/network/juce_URL.cpp
index c664504281..afc5fc44a1 100644
--- a/modules/juce_core/network/juce_URL.cpp
+++ b/modules/juce_core/network/juce_URL.cpp
@@ -223,8 +223,8 @@ String URL::toString (const bool includeGetParameters) const
 {
     if (includeGetParameters && parameterNames.size() > 0)
         return url + "?" + URLHelpers::getMangledParameters (*this);
-    else
-        return url;
+
+    return url;
 }
 
 bool URL::isWellFormed() const
diff --git a/modules/juce_core/streams/juce_SubregionStream.cpp b/modules/juce_core/streams/juce_SubregionStream.cpp
index 65790b742b..85e2314ed4 100644
--- a/modules/juce_core/streams/juce_SubregionStream.cpp
+++ b/modules/juce_core/streams/juce_SubregionStream.cpp
@@ -77,8 +77,8 @@ int SubregionStream::read (void* destBuffer, int maxBytesToRead)
 
 bool SubregionStream::isExhausted()
 {
-    if (lengthOfSourceStream >= 0)
-        return (getPosition() >= lengthOfSourceStream) || source->isExhausted();
-    else
-        return source->isExhausted();
+    if (lengthOfSourceStream >= 0 && getPosition() >= lengthOfSourceStream)
+        return true;
+
+    return source->isExhausted();
 }
diff --git a/modules/juce_core/text/juce_String.cpp b/modules/juce_core/text/juce_String.cpp
index 14f2acb722..ec8834c35b 100644
--- a/modules/juce_core/text/juce_String.cpp
+++ b/modules/juce_core/text/juce_String.cpp
@@ -1567,7 +1567,8 @@ String String::trim() const
 
         if (trimmedEnd <= start)
             return empty;
-        else if (text < start || trimmedEnd < end)
+
+        if (text < start || trimmedEnd < end)
             return String (start, trimmedEnd);
     }
 
@@ -1921,15 +1922,13 @@ String String::createStringFromData (const void* const data_, const int size)
     const uint8* const data = static_cast <const uint8*> (data_);
 
     if (size <= 0 || data == nullptr)
-    {
         return empty;
-    }
-    else if (size == 1)
-    {
+
+    if (size == 1)
         return charToString ((juce_wchar) data[0]);
-    }
-    else if ((data[0] == (uint8) CharPointer_UTF16::byteOrderMarkBE1 && data[1] == (uint8) CharPointer_UTF16::byteOrderMarkBE2)
-          || (data[0] == (uint8) CharPointer_UTF16::byteOrderMarkLE1 && data[1] == (uint8) CharPointer_UTF16::byteOrderMarkLE2))
+
+    if ((data[0] == (uint8) CharPointer_UTF16::byteOrderMarkBE1 && data[1] == (uint8) CharPointer_UTF16::byteOrderMarkBE2)
+         || (data[0] == (uint8) CharPointer_UTF16::byteOrderMarkLE1 && data[1] == (uint8) CharPointer_UTF16::byteOrderMarkLE2))
     {
         const bool bigEndian = (data[0] == (uint8) CharPointer_UTF16::byteOrderMarkBE1);
         const int numChars = size / 2 - 1;
@@ -1952,20 +1951,18 @@ String String::createStringFromData (const void* const data_, const int size)
         builder.write (0);
         return builder.result;
     }
-    else
-    {
-        const uint8* start = data;
-        const uint8* end = data + size;
 
-        if (size >= 3
-              && data[0] == (uint8) CharPointer_UTF8::byteOrderMark1
-              && data[1] == (uint8) CharPointer_UTF8::byteOrderMark2
-              && data[2] == (uint8) CharPointer_UTF8::byteOrderMark3)
-            start += 3;
+    const uint8* start = data;
+    const uint8* end = data + size;
 
-        return String (CharPointer_UTF8 ((const char*) start),
-                       CharPointer_UTF8 ((const char*) end));
-    }
+    if (size >= 3
+          && data[0] == (uint8) CharPointer_UTF8::byteOrderMark1
+          && data[1] == (uint8) CharPointer_UTF8::byteOrderMark2
+          && data[2] == (uint8) CharPointer_UTF8::byteOrderMark3)
+        start += 3;
+
+    return String (CharPointer_UTF8 ((const char*) start),
+                   CharPointer_UTF8 ((const char*) end));
 }
 
 //==============================================================================
diff --git a/modules/juce_core/xml/juce_XmlDocument.cpp b/modules/juce_core/xml/juce_XmlDocument.cpp
index 92bd458a02..9139e1c705 100644
--- a/modules/juce_core/xml/juce_XmlDocument.cpp
+++ b/modules/juce_core/xml/juce_XmlDocument.cpp
@@ -841,8 +841,8 @@ String XmlDocument::getParameterEntity (const String& entity)
 
             if (ent.equalsIgnoreCase ("system"))
                 return getFileContents (tokenisedDTD [i + 2].trimCharactersAtEnd (">"));
-            else
-                return ent.trim().unquoted();
+
+            return ent.trim().unquoted();
         }
     }
 
diff --git a/modules/juce_data_structures/app_properties/juce_PropertiesFile.cpp b/modules/juce_data_structures/app_properties/juce_PropertiesFile.cpp
index 5a7a7d00d0..6d91f7dfd7 100644
--- a/modules/juce_data_structures/app_properties/juce_PropertiesFile.cpp
+++ b/modules/juce_data_structures/app_properties/juce_PropertiesFile.cpp
@@ -171,8 +171,8 @@ bool PropertiesFile::save()
 
     if (options.storageFormat == storeAsXML)
         return saveAsXml();
-    else
-        return saveAsBinary();
+
+    return saveAsBinary();
 }
 
 bool PropertiesFile::loadAsXml()
diff --git a/modules/juce_events/native/juce_linux_Messaging.cpp b/modules/juce_events/native/juce_linux_Messaging.cpp
index 359114be50..11bba22471 100644
--- a/modules/juce_events/native/juce_linux_Messaging.cpp
+++ b/modules/juce_events/native/juce_linux_Messaging.cpp
@@ -92,8 +92,8 @@ public:
         // to keep everything running smoothly..
         if ((++totalEventCount & 1) != 0)
             return dispatchNextXEvent() || dispatchNextInternalMessage();
-        else
-            return dispatchNextInternalMessage() || dispatchNextXEvent();
+
+        return dispatchNextInternalMessage() || dispatchNextXEvent();
     }
 
     // Wait for an event (either XEvent, or an internal Message)
diff --git a/modules/juce_gui_basics/drawables/juce_DrawableShape.cpp b/modules/juce_gui_basics/drawables/juce_DrawableShape.cpp
index 557b0f98ca..90905a7dc0 100644
--- a/modules/juce_gui_basics/drawables/juce_DrawableShape.cpp
+++ b/modules/juce_gui_basics/drawables/juce_DrawableShape.cpp
@@ -189,8 +189,8 @@ Rectangle<float> DrawableShape::getDrawableBounds() const
 {
     if (isStrokeVisible())
         return strokePath.getBounds();
-    else
-        return path.getBounds();
+
+    return path.getBounds();
 }
 
 bool DrawableShape::hitTest (int x, int y)
diff --git a/modules/juce_gui_basics/drawables/juce_SVGParser.cpp b/modules/juce_gui_basics/drawables/juce_SVGParser.cpp
index 99a2e31e43..48ea05825f 100644
--- a/modules/juce_gui_basics/drawables/juce_SVGParser.cpp
+++ b/modules/juce_gui_basics/drawables/juce_SVGParser.cpp
@@ -1026,10 +1026,10 @@ private:
                 return Colour ((uint8) (hex [0] * 0x11),
                                (uint8) (hex [1] * 0x11),
                                (uint8) (hex [2] * 0x11));
-            else
-                return Colour ((uint8) ((hex [0] << 4) + hex [1]),
-                               (uint8) ((hex [2] << 4) + hex [3]),
-                               (uint8) ((hex [4] << 4) + hex [5]));
+
+            return Colour ((uint8) ((hex [0] << 4) + hex [1]),
+                           (uint8) ((hex [2] << 4) + hex [3]),
+                           (uint8) ((hex [4] << 4) + hex [5]));
         }
         else if (s [index] == 'r'
                   && s [index + 1] == 'g'
diff --git a/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm b/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm
index a60962e660..a5b7aa8c7d 100644
--- a/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm
+++ b/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm
@@ -1616,12 +1616,11 @@ private:
 
     static NSDragOperation draggingUpdated (id self, SEL, id <NSDraggingInfo> sender)
     {
-        NSViewComponentPeer* const owner = getOwner (self);
+        if (NSViewComponentPeer* const owner = getOwner (self))
+            if (owner->sendDragCallback (0, sender))
+                return NSDragOperationCopy | NSDragOperationMove | NSDragOperationGeneric;
 
-        if (owner != nullptr && owner->sendDragCallback (0, sender))
-            return NSDragOperationCopy | NSDragOperationMove | NSDragOperationGeneric;
-        else
-            return NSDragOperationNone;
+        return NSDragOperationNone;
     }
 
     static void draggingEnded (id self, SEL s, id <NSDraggingInfo> sender)
diff --git a/modules/juce_gui_basics/native/juce_win32_Windowing.cpp b/modules/juce_gui_basics/native/juce_win32_Windowing.cpp
index a78f812738..c3f0fc6615 100644
--- a/modules/juce_gui_basics/native/juce_win32_Windowing.cpp
+++ b/modules/juce_gui_basics/native/juce_win32_Windowing.cpp
@@ -2137,8 +2137,8 @@ private:
     {
         if (MessageManager::getInstance()->currentThreadHasLockedMessageManager())
             return callback (userData);
-        else
-            return MessageManager::getInstance()->callFunctionOnMessageThread (callback, userData);
+
+        return MessageManager::getInstance()->callFunctionOnMessageThread (callback, userData);
     }
 
     static Point<int> getPointFromLParam (LPARAM lParam) noexcept
diff --git a/modules/juce_gui_basics/widgets/juce_Slider.cpp b/modules/juce_gui_basics/widgets/juce_Slider.cpp
index cb4e9bf766..57c9499f83 100644
--- a/modules/juce_gui_basics/widgets/juce_Slider.cpp
+++ b/modules/juce_gui_basics/widgets/juce_Slider.cpp
@@ -109,14 +109,10 @@ public:
     float getPositionOfValue (const double value) const
     {
         if (isHorizontal() || isVertical())
-        {
             return getLinearSliderPos (value);
-        }
-        else
-        {
-            jassertfalse; // not a valid call on a slider that doesn't work linearly!
-            return 0.0f;
-        }
+
+        jassertfalse; // not a valid call on a slider that doesn't work linearly!
+        return 0.0f;
     }
 
     void setRange (const double newMin, const double newMax, const double newInt)
@@ -684,7 +680,8 @@ public:
 
             if (normalPosDistance >= minPosDistance && maxPosDistance >= minPosDistance)
                 return 1;
-            else if (normalPosDistance >= maxPosDistance)
+
+            if (normalPosDistance >= maxPosDistance)
                 return 2;
         }
 
@@ -1489,8 +1486,8 @@ String Slider::getTextFromValue (double v)
 {
     if (getNumDecimalPlacesToDisplay() > 0)
         return String (v, getNumDecimalPlacesToDisplay()) + getTextValueSuffix();
-    else
-        return String (roundToInt (v)) + getTextValueSuffix();
+
+    return String (roundToInt (v)) + getTextValueSuffix();
 }
 
 double Slider::getValueFromText (const String& text)
diff --git a/modules/juce_gui_basics/widgets/juce_Toolbar.cpp b/modules/juce_gui_basics/widgets/juce_Toolbar.cpp
index f13a35719f..2b445f437e 100644
--- a/modules/juce_gui_basics/widgets/juce_Toolbar.cpp
+++ b/modules/juce_gui_basics/widgets/juce_Toolbar.cpp
@@ -269,12 +269,9 @@ void Toolbar::clear()
 
 ToolbarItemComponent* Toolbar::createItem (ToolbarItemFactory& factory, const int itemId)
 {
-    if (itemId == ToolbarItemFactory::separatorBarId)
-        return new Spacer (itemId, 0.1f, true);
-    else if (itemId == ToolbarItemFactory::spacerId)
-        return new Spacer (itemId, 0.5f, false);
-    else if (itemId == ToolbarItemFactory::flexibleSpacerId)
-        return new Spacer (itemId, 0, false);
+    if (itemId == ToolbarItemFactory::separatorBarId)    return new Spacer (itemId, 0.1f, true);
+    if (itemId == ToolbarItemFactory::spacerId)          return new Spacer (itemId, 0.5f, false);
+    if (itemId == ToolbarItemFactory::flexibleSpacerId)  return new Spacer (itemId, 0.0f, false);
 
     return factory.createItem (itemId);
 }
@@ -336,8 +333,10 @@ int Toolbar::getNumItems() const noexcept
 
 int Toolbar::getItemId (const int itemIndex) const noexcept
 {
-    ToolbarItemComponent* const tc = getItemComponent (itemIndex);
-    return tc != nullptr ? tc->getItemId() : 0;
+    if (ToolbarItemComponent* const tc = getItemComponent (itemIndex))
+        return tc->getItemId();
+
+    return 0;
 }
 
 ToolbarItemComponent* Toolbar::getItemComponent (const int itemIndex) const noexcept
@@ -350,16 +349,17 @@ ToolbarItemComponent* Toolbar::getNextActiveComponent (int index, const int delt
     for (;;)
     {
         index += delta;
-        ToolbarItemComponent* const tc = getItemComponent (index);
-
-        if (tc == nullptr)
-            break;
 
-        if (tc->isActive)
-            return tc;
+        if (ToolbarItemComponent* const tc = getItemComponent (index))
+        {
+            if (tc->isActive)
+                return tc;
+        }
+        else
+        {
+            return nullptr;
+        }
     }
-
-    return nullptr;
 }
 
 void Toolbar::setStyle (const ToolbarItemStyle& newStyle)
diff --git a/modules/juce_gui_basics/widgets/juce_TreeView.cpp b/modules/juce_gui_basics/widgets/juce_TreeView.cpp
index 7831e0b90f..8c5a5cdd8b 100644
--- a/modules/juce_gui_basics/widgets/juce_TreeView.cpp
+++ b/modules/juce_gui_basics/widgets/juce_TreeView.cpp
@@ -1222,8 +1222,8 @@ bool TreeViewItem::isOpen() const noexcept
 {
     if (openness == opennessDefault)
         return ownerView != nullptr && ownerView->defaultOpenness;
-    else
-        return openness == opennessOpen;
+
+    return openness == opennessOpen;
 }
 
 void TreeViewItem::setOpen (const bool shouldBeOpen)
diff --git a/modules/juce_gui_extra/native/juce_win32_SystemTrayIcon.cpp b/modules/juce_gui_extra/native/juce_win32_SystemTrayIcon.cpp
index 2136d466e0..206fa6cda6 100644
--- a/modules/juce_gui_extra/native/juce_win32_SystemTrayIcon.cpp
+++ b/modules/juce_gui_extra/native/juce_win32_SystemTrayIcon.cpp
@@ -158,12 +158,10 @@ public:
 
     static LRESULT CALLBACK hookedWndProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     {
-        Pimpl* const p = getPimpl (hwnd);
-
-        if (p != nullptr)
+        if (Pimpl* const p = getPimpl (hwnd))
             return p->windowProc  (hwnd, message, wParam, lParam);
-        else
-            return DefWindowProcW (hwnd, message, wParam, lParam);
+
+        return DefWindowProcW (hwnd, message, wParam, lParam);
    }
 
     LRESULT windowProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)