diff --git a/extras/JuceDemo/Builds/Android/build.xml b/extras/JuceDemo/Builds/Android/build.xml
index bca554ffb9..6bffadde89 100644
--- a/extras/JuceDemo/Builds/Android/build.xml
+++ b/extras/JuceDemo/Builds/Android/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project name="Juce Demo" default="help">
+<project name="Juce Demo" default="debug">
   <property file="local.properties"/>
   <property file="build.properties"/>
   <property file="default.properties"/>
diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp
index 819e6e6d88..b108d4f6eb 100644
--- a/juce_amalgamated.cpp
+++ b/juce_amalgamated.cpp
@@ -14173,29 +14173,20 @@ int StringArray::addTokens (const String& text, const bool preserveQuotedStrings
 int StringArray::addTokens (const String& text, const String& breakCharacters, const String& quoteCharacters)
 {
 	int num = 0;
+	String::CharPointerType t (text.getCharPointer());
 
-	if (text.isNotEmpty())
+	while (! t.isEmpty())
 	{
-		String::CharPointerType t (text.getCharPointer());
+		String::CharPointerType tokenEnd (CharacterFunctions::findEndOfToken (t,
+																			  breakCharacters.getCharPointer(),
+																			  quoteCharacters.getCharPointer()));
+		add (String (t, tokenEnd));
+		++num;
 
-		for (;;)
-		{
-			String::CharPointerType tokenEnd (CharacterFunctions::findEndOfToken (t,
-																				  breakCharacters.getCharPointer(),
-																				  quoteCharacters.getCharPointer()));
-
-			if (tokenEnd == t)
-				break;
-
-			add (String (t, tokenEnd));
-			++num;
-			t = tokenEnd;
-
-			if (t.isEmpty())
-				break;
+		if (tokenEnd.isEmpty())
+			break;
 
-			++t;
-		}
+		t = ++tokenEnd;
 	}
 
 	return num;
diff --git a/src/text/juce_StringArray.cpp b/src/text/juce_StringArray.cpp
index 274bfe2be2..c1123c2ff6 100644
--- a/src/text/juce_StringArray.cpp
+++ b/src/text/juce_StringArray.cpp
@@ -351,29 +351,20 @@ int StringArray::addTokens (const String& text, const bool preserveQuotedStrings
 int StringArray::addTokens (const String& text, const String& breakCharacters, const String& quoteCharacters)
 {
     int num = 0;
+    String::CharPointerType t (text.getCharPointer());
 
-    if (text.isNotEmpty())
+    while (! t.isEmpty())
     {
-        String::CharPointerType t (text.getCharPointer());
+        String::CharPointerType tokenEnd (CharacterFunctions::findEndOfToken (t,
+                                                                              breakCharacters.getCharPointer(),
+                                                                              quoteCharacters.getCharPointer()));
+        add (String (t, tokenEnd));
+        ++num;
 
-        for (;;)
-        {
-            String::CharPointerType tokenEnd (CharacterFunctions::findEndOfToken (t,
-                                                                                  breakCharacters.getCharPointer(),
-                                                                                  quoteCharacters.getCharPointer()));
-
-            if (tokenEnd == t)
-                break;
+        if (tokenEnd.isEmpty())
+            break;
 
-            add (String (t, tokenEnd));
-            ++num;
-            t = tokenEnd;
-
-            if (t.isEmpty())
-                break;
-
-            ++t;
-        }
+        t = ++tokenEnd;
     }
 
     return num;