diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/CodeReader.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/CodeReader.java
index 5acf82a8326..1454f040aa4 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/CodeReader.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/CodeReader.java
@@ -24,7 +24,8 @@ import java.nio.charset.Charset;
  */
 public class CodeReader {
 
-	private static final String NOFILE = "<text>";
+	private static final String UTF_8 = "UTF-8"; //$NON-NLS-1$
+	private static final String NOFILE = "<text>"; //$NON-NLS-1$
 	
 	public final char[] buffer;
 	public final String filename;
@@ -67,31 +68,30 @@ public class CodeReader {
 		byteBuffer.rewind();
 
 		// TODO use the real encoding
-		CharBuffer charBuffer = Charset.forName("UTF-8").decode(byteBuffer);
+		CharBuffer charBuffer = Charset.forName(UTF_8).decode(byteBuffer);
 		if (charBuffer.hasArray())
 			return charBuffer.array();
-		else {
-			// Got to copy it out
-			char[] buff = new char[charBuffer.length()];
-			charBuffer.get(buff);
-			return buff;
-		}
+		// Got to copy it out
+		char[] buff = new char[charBuffer.length()];
+		charBuffer.get(buff);
+		return buff;
+		
 	}
 	
-	private char[] xload(FileInputStream stream) throws IOException {
+	protected char[] xload(FileInputStream stream) throws IOException {
 		FileChannel channel = stream.getChannel();
 		MappedByteBuffer map = channel.map(FileChannel.MapMode.READ_ONLY, 0, channel.size());
 
 		// TODO use the real encoding
-		CharBuffer charBuffer = Charset.forName("UTF-8").decode(map);
+		CharBuffer charBuffer = Charset.forName(UTF_8).decode(map);
 		if (charBuffer.hasArray())
 			return charBuffer.array();
-		else {
-			// Got to copy it out
-			char[] buff = new char[charBuffer.length()];
-			charBuffer.get(buff);
-			return buff;
-		}
+		
+		// Got to copy it out
+		char[] buff = new char[charBuffer.length()];
+		charBuffer.get(buff);
+		return buff;
+		
 	}
 	
 	public boolean isFile() {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/Scanner.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/Scanner.java
index 1d7f13edc3f..823d97e6e4e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/Scanner.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/Scanner.java
@@ -762,7 +762,6 @@ public final class Scanner implements IScanner, IScannerData {
 //	private boolean enableTrigraphReplacement = true;
 //	private boolean enableTrigraphReplacementInStrings = true;
 	private boolean throwExceptionOnBadCharacterRead = false; 
-	private boolean atEOF = false;
 
 	private boolean tokenizingMacroReplacementList = false;
 	protected static final String EMPTY_STRING = ""; //$NON-NLS-1$