diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2TemplateTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2TemplateTests.java
index 4b6bb4ef192..4534aa6063a 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2TemplateTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2TemplateTests.java
@@ -6085,7 +6085,7 @@ public class AST2TemplateTests extends AST2BaseTest {
 	public void testIsPOD_367993() throws Exception {
 		parseAndCheckBindings(getAboveComment(), CPP, true);
 	}
-	
+
 	//	template<typename T, void (T::*M)()> class A {
 	//	public:
 	//		static void Delegate(void* thiz) { ((T*)thiz->*M)(); }
@@ -6108,7 +6108,7 @@ public class AST2TemplateTests extends AST2BaseTest {
 	public void testDeductionOfNonTypeTemplateArg_372587() throws Exception {
 		parseAndCheckBindings(getAboveComment(), CPP, true);
 	}
-	
+
 	//	template<typename _Functor> void b(_Functor __f) {}
 	//	template<typename T, typename V> void f(T __first, T __last, const V& __val) {}
 	//	template<typename T> void f(T __first, T __last, const T& __val) {}
@@ -6117,8 +6117,8 @@ public class AST2TemplateTests extends AST2BaseTest {
 	//	}
 	public void testFunctionSetWithNonMatchingTemplateArgs_379604() throws Exception {
 		parseAndCheckBindings(getAboveComment(), CPP, true);
-	}	
-	
+	}
+
 	//	template <typename T> struct C {
 	//		typedef decltype(&T::m) dtm;
 	//	};
@@ -6133,8 +6133,8 @@ public class AST2TemplateTests extends AST2BaseTest {
 	//	}
 	public void testPointerToMemberAsDependentExpression_391001() throws Exception {
 		parseAndCheckBindings(getAboveComment(), CPP, true);
-	}	
-	
+	}
+
 	//	class Memory { };
 	//	Memory memory;
 	//	template<Memory* m> struct Container {
@@ -6148,8 +6148,8 @@ public class AST2TemplateTests extends AST2BaseTest {
 	//	}
 	public void testAddressAsTemplateArgument_391190() throws Exception {
 		parseAndCheckBindings(getAboveComment(), CPP, true);
-	}	
-	
+	}
+
 	//	template <typename T> struct CT {
 	//		const static int const_min= 1;
 	//	};
@@ -6158,7 +6158,7 @@ public class AST2TemplateTests extends AST2BaseTest {
 	//	}
 	public void testTemplateIDAmbiguity_393959() throws Exception {
 		parseAndCheckBindings(getAboveComment(), CPP, true);
-	}		
+	}
 
 	// template<typename T> class CT {
     //     void m() {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java
index 5fb3c781c4c..0c800038b38 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java
@@ -658,18 +658,17 @@ public class CPPVisitor extends ASTQueries {
 			        binding = new ProblemBinding(alias.getAlias(), IProblemBinding.SEMANTIC_NAME_NOT_FOUND);
 			    }
 			}
-
 			return binding;
 		} else if (declaration instanceof ICPPASTAliasDeclaration) {
 			ICPPASTAliasDeclaration alias = (ICPPASTAliasDeclaration) declaration;
 			ICPPScope scope = (ICPPScope) getContainingScope(declaration);
 			IBinding binding = scope.getBinding(alias.getAlias(), false);
 			if (!(binding instanceof ICPPInternalBinding)) {
-				
 				IType type = createType(alias.getMappingTypeId());
 				if (type instanceof IProblemBinding) {
 			    	IProblemBinding problem = (IProblemBinding) type;
-			    	type = new CPPClassType.CPPClassTypeProblem(problem.getASTNode(), problem.getID(), alias.getMappingTypeId().getAbstractDeclarator().getName().toCharArray());
+			    	type = new CPPClassType.CPPClassTypeProblem(problem.getASTNode(), problem.getID(),
+			    			alias.getMappingTypeId().getAbstractDeclarator().getName().toCharArray());
 			    }
 			    if (type != null) {
 			    	if (alias.getParent() instanceof ICPPASTTemplateDeclaration) {
@@ -1793,7 +1792,7 @@ public class CPPVisitor extends ASTQueries {
 		if (pDtor != null) {
 			pt = createType(pt, pDtor);
 		}
-		pt=  adjustParameterType(pt, forFuncType);
+		pt= adjustParameterType(pt, forFuncType);
 
 		if (pDtor != null && CPPVisitor.findInnermostDeclarator(pDtor).declaresParameterPack()) {
 			pt= new CPPParameterPackType(pt);
@@ -1837,13 +1836,12 @@ public class CPPVisitor extends ASTQueries {
 		return pTypes;
 	}
 
-
 	/**
 	 * Adjusts the parameter type according to 8.3.5-3:
 	 * cv-qualifiers are deleted, arrays and function types are converted to pointers.
 	 */
 	static IType adjustParameterType(final IType pt, boolean forFunctionType) {
-		// bug 239975
+		// Bug 239975
 		IType t= SemanticUtil.getNestedType(pt, TDEF);
 		if (t instanceof IArrayType) {
 			IArrayType at = (IArrayType) t;