diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/Linkage.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/Linkage.java
index 485e092db80..4414f2d530a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/Linkage.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/Linkage.java
@@ -33,7 +33,7 @@ public class Linkage implements ILinkage {
 	}
 
 	public static String getLinkageName(int linkageID) throws CoreException {
-		switch(linkageID) {
+		switch (linkageID) {
 		case NO_LINKAGE_ID: return NO_LINKAGE_NAME;
 		case C_LINKAGE_ID: return C_LINKAGE_NAME;
 		case CPP_LINKAGE_ID: return CPP_LINKAGE_NAME;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassSpecialization.java
index 1d6cea256da..e8a8497f532 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassSpecialization.java
@@ -122,7 +122,7 @@ public class CPPClassSpecialization extends CPPSpecialization
 	
 	@Override
 	public ICPPBase[] getBases() {
-		return getBases(null);
+		return getBases(null); // Instantiation of dependent expression may not work.
 	}
 
 	@Override
@@ -164,7 +164,7 @@ public class CPPClassSpecialization extends CPPSpecialization
 
 	@Override
 	public ICPPConstructor[] getConstructors() {
-		return getConstructors(null);
+		return getConstructors(null); // Instantiation of dependent expression may not work.
 	}
 
 	@Override
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassTemplatePartialSpecializationSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassTemplatePartialSpecializationSpecialization.java
index 443fc1218c8..8fbdd440b41 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassTemplatePartialSpecializationSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassTemplatePartialSpecializationSpecialization.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Markus Schorn - initial API and implementation
+ *     Markus Schorn - initial API and implementation
  *******************************************************************************/ 
 package org.eclipse.cdt.internal.core.dom.parser.cpp;
 
@@ -30,8 +30,7 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPTemplates;
  */
 public class CPPClassTemplatePartialSpecializationSpecialization extends CPPClassSpecialization
 		implements ICPPClassTemplatePartialSpecializationSpecialization, ICPPInternalClassTemplate {
-
-	private ObjectMap instances = null;
+	private ObjectMap instances;
 	private ICPPDeferredClassInstance fDeferredInstance;
 	private final ICPPClassTemplate fClassTemplate;
 	private final ICPPTemplateArgument[] fArguments;
@@ -70,7 +69,7 @@ public class CPPClassTemplatePartialSpecializationSpecialization extends CPPClas
 	public synchronized ICPPTemplateInstance[] getAllInstances() {
 		if (instances != null) {
 			ICPPTemplateInstance[] result= new ICPPTemplateInstance[instances.size()];
-			for (int i=0; i < instances.size(); i++) {
+			for (int i= 0; i < instances.size(); i++) {
 				result[i]= (ICPPTemplateInstance) instances.getAt(i);
 			}
 			return result;
@@ -142,7 +141,7 @@ public class CPPClassTemplatePartialSpecializationSpecialization extends CPPClas
 	
 	@Override
 	public ICPPTemplateArgument getDefaultArgFromIndex(int paramPos) throws DOMException {
-		// no default arguments for partial specializations
+		// No default arguments for partial specializations
 		return null;
 	}
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassScope.java
index ab9e34545f0..9de1673b314 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassScope.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassScope.java
@@ -6,8 +6,8 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Andrew Ferguson (Symbian) - Initial implementation
- *    Markus Schorn (Wind River Systems)
+ *     Andrew Ferguson (Symbian) - Initial implementation
+ *     Markus Schorn (Wind River Systems)
  *******************************************************************************/
 package org.eclipse.cdt.internal.core.index.composite.cpp;
 
@@ -43,8 +43,8 @@ class CompositeCPPClassScope extends CompositeScope implements ICPPClassScope {
 	public ICPPMethod[] getImplicitMethods() {
 		ICPPClassScope rscope = (ICPPClassScope) ((ICPPClassType)rbinding).getCompositeScope();
 		ICPPMethod[] result = rscope.getImplicitMethods();
-		for(int i=0; i<result.length; i++) {
-			result[i] = (ICPPMethod) cf.getCompositeBinding((IIndexFragmentBinding)result[i]);
+		for (int i= 0; i < result.length; i++) {
+			result[i] = (ICPPMethod) cf.getCompositeBinding((IIndexFragmentBinding) result[i]);
 		}
 		return result;
 	}
@@ -53,15 +53,15 @@ class CompositeCPPClassScope extends CompositeScope implements ICPPClassScope {
 	public ICPPConstructor[] getConstructors() {
 		ICPPClassScope rscope = (ICPPClassScope) ((ICPPClassType)rbinding).getCompositeScope();
 		ICPPConstructor[] result = rscope.getConstructors();
-		for(int i=0; i<result.length; i++) {
-			result[i] = (ICPPConstructor) cf.getCompositeBinding((IIndexFragmentBinding)result[i]);
+		for (int i= 0; i < result.length; i++) {
+			result[i] = (ICPPConstructor) cf.getCompositeBinding((IIndexFragmentBinding) result[i]);
 		}
 		return result;
 	}
 
 	@Override
 	public IBinding getBinding(IASTName name, boolean resolve, IIndexFileSet fileSet) {
-		IBinding binding = ((ICPPClassType)rbinding).getCompositeScope().getBinding(name, resolve, fileSet);
+		IBinding binding = ((ICPPClassType) rbinding).getCompositeScope().getBinding(name, resolve, fileSet);
 		return processUncertainBinding(binding);
 	}
 
@@ -72,13 +72,13 @@ class CompositeCPPClassScope extends CompositeScope implements ICPPClassScope {
 
 	@Override
 	public IBinding[] getBindings(ScopeLookupData lookup) {
-		IBinding[] bindings = ((ICPPClassType)rbinding).getCompositeScope().getBindings(lookup);
+		IBinding[] bindings = ((ICPPClassType) rbinding).getCompositeScope().getBindings(lookup);
 		return processUncertainBindings(bindings);
 	}
 	
 	@Override
 	public IBinding[] find(String name) {
-		IBinding[] preresult = ((ICPPClassType)rbinding).getCompositeScope().find(name);
+		IBinding[] preresult = ((ICPPClassType) rbinding).getCompositeScope().find(name);
 		return processUncertainBindings(preresult);	
 	}
 	
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassSpecialization.java
index c33fa703f25..5aba0d03b0f 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassSpecialization.java
@@ -129,7 +129,7 @@ public class CompositeCPPClassSpecialization extends CompositeCPPClassType imple
 
 	@Override
 	public final ICPPBase[] getBases() {
-		return getBases(null);
+		return getBases(null); // Instantiation of dependent expression may not work.
 	}
 
 	@Override
@@ -143,7 +143,7 @@ public class CompositeCPPClassSpecialization extends CompositeCPPClassType imple
 	
 	@Override
 	public final ICPPConstructor[] getConstructors() {
-		return getConstructors(null);
+		return getConstructors(null); // Instantiation of dependent expression may not work.
 	}
 
 	@Override
@@ -157,7 +157,7 @@ public class CompositeCPPClassSpecialization extends CompositeCPPClassType imple
 
 	@Override
 	public final ICPPMethod[] getDeclaredMethods() {
-		return getDeclaredMethods(null);
+		return getDeclaredMethods(null); // Instantiation of dependent expression may not work.
 	}
 
 	@Override
@@ -171,7 +171,7 @@ public class CompositeCPPClassSpecialization extends CompositeCPPClassType imple
 
 	@Override
 	public final ICPPField[] getDeclaredFields() {
-		return getDeclaredFields(null);
+		return getDeclaredFields(null); // Instantiation of dependent expression may not work.
 	}
 
 	@Override
@@ -185,7 +185,7 @@ public class CompositeCPPClassSpecialization extends CompositeCPPClassType imple
 
 	@Override
 	public final IBinding[] getFriends() {
-		return getFriends(null);
+		return getFriends(null); // Instantiation of dependent expression may not work.
 	}
 
 	@Override
@@ -199,7 +199,7 @@ public class CompositeCPPClassSpecialization extends CompositeCPPClassType imple
 
 	@Override
 	public final ICPPClassType[] getNestedClasses() {
-		return getNestedClasses(null);
+		return getNestedClasses(null); // Instantiation of dependent expression may not work.
 	}
 
 	@Override
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassTemplatePartialSpecializationSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassTemplatePartialSpecializationSpecialization.java
index 1418d866aa9..9570ec658cd 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassTemplatePartialSpecializationSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassTemplatePartialSpecializationSpecialization.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Markus Schorn - initial API and implementation
+ *     Markus Schorn - initial API and implementation
  *******************************************************************************/ 
 package org.eclipse.cdt.internal.core.index.composite.cpp;
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassSpecialization.java
index 92b9cc2a8a6..a90da22c5ef 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassSpecialization.java
@@ -208,7 +208,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements
 
 	@Override
 	public ICPPBase[] getBases() {
-		return getBases(null);
+		return getBases(null); // Instantiation of dependent expression may not work.
 	}
 
 	@Override
@@ -241,7 +241,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements
 
 	@Override
 	public ICPPConstructor[] getConstructors() {
-		return getConstructors(null);
+		return getConstructors(null); // Instantiation of dependent expression may not work.
 	}
 
 	@Override
@@ -262,7 +262,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements
 
 	@Override
 	public ICPPMethod[] getDeclaredMethods() {
-		return getDeclaredMethods(null);
+		return getDeclaredMethods(null); // Instantiation of dependent expression may not work.
 	}
 
 	@Override
@@ -283,7 +283,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements
 
 	@Override
 	public ICPPField[] getDeclaredFields() {
-		return getDeclaredFields(null);
+		return getDeclaredFields(null); // Instantiation of dependent expression may not work.
 	}
 
 	@Override
@@ -304,7 +304,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements
 
 	@Override
 	public ICPPClassType[] getNestedClasses() {
-		return getNestedClasses(null);
+		return getNestedClasses(null); // Instantiation of dependent expression may not work.
 	}
 
 	@Override
@@ -325,7 +325,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements
 
 	@Override
 	public IBinding[] getFriends() {
-		return getFriends(null);
+		return getFriends(null); // Instantiation of dependent expression may not work.
 	}
 
 	@Override