diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/AbstractPartialContentAssistParser.java b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/AbstractPartialContentAssistParser.java
index df6f9fd53..0031cd9aa 100644
--- a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/AbstractPartialContentAssistParser.java
+++ b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/AbstractPartialContentAssistParser.java
@@ -119,8 +119,7 @@ public abstract class AbstractPartialContentAssistParser extends AbstractContent
 					if (skippedAs != null) {
 						result.append(skippedAs);
 					} else {
-						if (appendTextToParse((ICompositeNode) child, offset, skipOptional
-								|| child.getTotalEndOffset() < offset, result)) {
+						if (appendTextToParse((ICompositeNode) child, offset, skipOptional, result)) {
 							return true;
 						}
 					}
diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Files.java b/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Files.java
index 6b9e3b78d..3d7cee94d 100644
--- a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Files.java
+++ b/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Files.java
@@ -100,7 +100,8 @@ public class Files {
 			}
 		}
 		if (deleteParentFolder) {
-			if (parentFolder.list() != null && parentFolder.list().length == 0 && !parentFolder.delete()) {
+			String[] children = parentFolder.list();
+			if (children != null && children.length == 0 && !parentFolder.delete()) {
 				log.error("Couldn't delete " + parentFolder.getAbsolutePath());
 				return false;
 			}