diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/InstantiationContext.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/InstantiationContext.java
index f9a51700f3d..16b0c4d54cc 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/InstantiationContext.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/InstantiationContext.java
@@ -32,8 +32,7 @@ public final class InstantiationContext {
 
 	/**
 	 * @param parameterMap mapping of template parameters to arguments, may be {@code null}.
-	 * @param packOffset parameter pack offset, or -1 if expansion of a parameter pack is not desired
-	 *     pack.
+	 * @param packOffset parameter pack offset, or -1 if expansion of a parameter pack is not desired pack.
 	 * @param contextTypeSpecialization the type specialization if instantiation happens inside a specialized
 	 *     type, otherwise {@code null}.
 	 * @param point the point of instantiation
@@ -132,7 +131,7 @@ public final class InstantiationContext {
 	/**
 	 * Returns the point of instantiation
 	 */
-	public IASTNode getPoint() {
+	public final IASTNode getPoint() {
 		return point;
 	}
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalFunctionCall.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalFunctionCall.java
index 74ac51e9f84..096b7421c2d 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalFunctionCall.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalFunctionCall.java
@@ -85,8 +85,7 @@ public class EvalFunctionCall extends CPPDependentEvaluation {
 
 	@Override
 	public boolean isConstantExpression(IASTNode point) {
-		return areAllConstantExpressions(fArguments, point)
-			&& isNullOrConstexprFunc(getOverload(point));
+		return areAllConstantExpressions(fArguments, point) && isNullOrConstexprFunc(getOverload(point));
 	}
 
 	public ICPPFunction getOverload(IASTNode point) {
@@ -184,7 +183,8 @@ public class EvalFunctionCall extends CPPDependentEvaluation {
 
 		if (args[0] instanceof EvalFunctionSet && getOverload(context.getPoint()) == null) {
 			// Resolve the function using the parameters of the function call.
-			args[0] = ((EvalFunctionSet) args[0]).resolveFunction(Arrays.copyOfRange(args, 1, args.length), context.getPoint());
+			EvalFunctionSet functionSet = (EvalFunctionSet) args[0];
+			args[0] = functionSet.resolveFunction(Arrays.copyOfRange(args, 1, args.length), context.getPoint());
 		}
 		return new EvalFunctionCall(args, getTemplateDefinition());
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalMemberAccess.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalMemberAccess.java
index 9388af02786..eff7d8b2d7e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalMemberAccess.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalMemberAccess.java
@@ -165,8 +165,8 @@ public class EvalMemberAccess extends CPPDependentEvaluation {
 		return false;
 	}
 
-	public static IType getFieldOwnerType(IType fieldOwnerExpressionType, boolean isDeref, IASTNode point, Collection<ICPPFunction> functionBindings,
-			boolean returnDependent) {
+	public static IType getFieldOwnerType(IType fieldOwnerExpressionType, boolean isDeref, IASTNode point,
+			Collection<ICPPFunction> functionBindings, boolean returnDependent) {
     	IType type= fieldOwnerExpressionType;
     	if (!isDeref)
     		return type;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalTypeId.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalTypeId.java
index 2af37523de7..11e093d9e5e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalTypeId.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalTypeId.java
@@ -147,8 +147,8 @@ public class EvalTypeId extends CPPDependentEvaluation {
 	@Override
 	public boolean isConstantExpression(IASTNode point) {
 		return !fRepresentsNewExpression
-			&& areAllConstantExpressions(fArguments, point)
-			&& isNullOrConstexprFunc(getConstructor(point));
+				&& areAllConstantExpressions(fArguments, point)
+				&& isNullOrConstexprFunc(getConstructor(point));
 	}
 
 	@Override