diff --git a/src/modules/sound/lullaby/FLACDecoder.cpp b/src/modules/sound/lullaby/FLACDecoder.cpp
index b416f30a9..71f4cf315 100644
--- a/src/modules/sound/lullaby/FLACDecoder.cpp
+++ b/src/modules/sound/lullaby/FLACDecoder.cpp
@@ -52,12 +52,12 @@ bool FLACDecoder::accepts(const std::string &ext)
 	// Please remove once it's no longer the case.
 	static const std::string supported[] =
 	{
-		"flac", "ogg", ""
+		"flac", "ogg"
 	};
 
-	for (int i = 0; !(supported[i].empty()); i++)
+	for (const auto& s : supported)
 	{
-		if (supported[i].compare(ext) == 0)
+		if (s.compare(ext) == 0)
 			return true;
 	}
 
diff --git a/src/modules/sound/lullaby/GmeDecoder.cpp b/src/modules/sound/lullaby/GmeDecoder.cpp
index fbf4b5bfa..3638eebd9 100644
--- a/src/modules/sound/lullaby/GmeDecoder.cpp
+++ b/src/modules/sound/lullaby/GmeDecoder.cpp
@@ -72,12 +72,12 @@ bool GmeDecoder::accepts(const std::string &ext)
 	static const std::string supported[] =
 	{
 		"ay", "gbs", "gym", "hes", "kss", "nsf",
-		"nsfe", "sap", "spc", "vgm", "vgz", ""
+		"nsfe", "sap", "spc", "vgm", "vgz",
 	};
 
-	for (int i = 0; !(supported[i].empty()); i++)
+	for (const auto& s : supported)
 	{
-		if (supported[i].compare(ext) == 0)
+		if (s.compare(ext) == 0)
 			return true;
 	}
 
diff --git a/src/modules/sound/lullaby/MP3Decoder.cpp b/src/modules/sound/lullaby/MP3Decoder.cpp
index 76b2228fb..00c4740e1 100644
--- a/src/modules/sound/lullaby/MP3Decoder.cpp
+++ b/src/modules/sound/lullaby/MP3Decoder.cpp
@@ -74,12 +74,12 @@ bool MP3Decoder::accepts(const std::string &ext)
 {
 	static const std::string supported[] =
 	{
-		"mp3", ""
+		"mp3"
 	};
 
-	for (int i = 0; !(supported[i].empty()); i++)
+	for (const auto& s : supported)
 	{
-		if (supported[i].compare(ext) == 0)
+		if (s.compare(ext) == 0)
 			return true;
 	}
 
diff --git a/src/modules/sound/lullaby/ModPlugDecoder.cpp b/src/modules/sound/lullaby/ModPlugDecoder.cpp
index 269e934c9..f38df31b0 100644
--- a/src/modules/sound/lullaby/ModPlugDecoder.cpp
+++ b/src/modules/sound/lullaby/ModPlugDecoder.cpp
@@ -84,12 +84,11 @@ bool ModPlugDecoder::accepts(const std::string &ext)
 		"dsm", "far", "it", "j2b", "mdl", "med",
 		"mid", "mod", "mt2", "mtm", "okt", "pat",
 		"psm", "s3m", "stm", "ult", "umx",  "xm",
-		""
 	};
 
-	for (int i = 0; !(supported[i].empty()); i++)
+	for (const auto &s : supported)
 	{
-		if (supported[i].compare(ext) == 0)
+		if (s.compare(ext) == 0)
 			return true;
 	}
 
diff --git a/src/modules/sound/lullaby/VorbisDecoder.cpp b/src/modules/sound/lullaby/VorbisDecoder.cpp
index a955bc474..b9de52347 100644
--- a/src/modules/sound/lullaby/VorbisDecoder.cpp
+++ b/src/modules/sound/lullaby/VorbisDecoder.cpp
@@ -168,12 +168,12 @@ bool VorbisDecoder::accepts(const std::string &ext)
 {
 	static const std::string supported[] =
 	{
-		"ogg", "oga", "ogv", ""
+		"ogg", "oga", "ogv"
 	};
 
-	for (int i = 0; !(supported[i].empty()); i++)
+	for (const auto& s : supported)
 	{
-		if (supported[i].compare(ext) == 0)
+		if (s.compare(ext) == 0)
 			return true;
 	}
 
diff --git a/src/modules/sound/lullaby/WaveDecoder.cpp b/src/modules/sound/lullaby/WaveDecoder.cpp
index c7b680409..95dbfa2b4 100644
--- a/src/modules/sound/lullaby/WaveDecoder.cpp
+++ b/src/modules/sound/lullaby/WaveDecoder.cpp
@@ -103,12 +103,12 @@ bool WaveDecoder::accepts(const std::string &ext)
 {
 	static const std::string supported[] =
 	{
-		"wav", ""
+		"wav"
 	};
 
-	for (int i = 0; !(supported[i].empty()); i++)
+	for (const auto& s : supported)
 	{
-		if (supported[i].compare(ext) == 0)
+		if (s.compare(ext) == 0)
 			return true;
 	}