diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/PmdAnalysis.java b/pmd-core/src/main/java/net/sourceforge/pmd/PmdAnalysis.java
index c923617925..22d6ffe30f 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/PmdAnalysis.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/PmdAnalysis.java
@@ -362,7 +362,7 @@ public final class PmdAnalysis implements AutoCloseable {
 
                 List<AutoCloseable> analyses = new ArrayList<>();
                 try {
-                    for (Language lang : lpRegistry) {
+                    for (Language lang : lpRegistry.getLanguages()) {
                         analyses.add(lpRegistry.getProcessor(lang).launchAnalysis(analysisTask));
                     }
                 } finally {
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/processor/PmdRunnableTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/processor/PmdRunnableTest.java
index 62f2b7adf4..7cc999eabc 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/processor/PmdRunnableTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/processor/PmdRunnableTest.java
@@ -35,7 +35,6 @@ import net.sourceforge.pmd.internal.SystemProps;
 import net.sourceforge.pmd.internal.util.AssertionUtil;
 import net.sourceforge.pmd.internal.util.ContextedAssertionError;
 import net.sourceforge.pmd.lang.DummyLanguageModule;
-import net.sourceforge.pmd.lang.LanguagePropertyBundle;
 import net.sourceforge.pmd.lang.LanguageRegistry;
 import net.sourceforge.pmd.lang.LanguageVersion;
 import net.sourceforge.pmd.lang.ast.Node;
@@ -167,31 +166,29 @@ public class PmdRunnableTest {
                                   .addVersion(THROWS_SEMANTIC_ERROR)
                                   .addVersion(PARSER_REPORTS_SEMANTIC_ERROR)
                                   .addDefaultVersion(""),
-                  props -> () -> makeParser(props));
+                  ThrowingLanguageModule::makeParser);
         }
 
-        private static Parser makeParser(LanguagePropertyBundle bundle) {
-            switch (bundle.getLanguageVersion().getVersion()) {
-            case THROWS_ASSERTION_ERROR:
-                return task -> {
+        private static Parser makeParser() {
+            return task -> {
+                switch (task.getLanguageVersion().getVersion()) {
+                case THROWS_ASSERTION_ERROR:
                     throw new AssertionError("test error while parsing");
-                };
-            case PARSER_REPORTS_SEMANTIC_ERROR:
-                return task -> {
+                case PARSER_REPORTS_SEMANTIC_ERROR: {
                     RootNode root = DummyLanguageModule.readLispNode(task);
                     task.getReporter().error(root, TEST_MESSAGE_SEMANTIC_ERROR);
                     return root;
-                };
-            case THROWS_SEMANTIC_ERROR:
-                return task -> {
+                }
+                case THROWS_SEMANTIC_ERROR: {
                     RootNode root = DummyLanguageModule.readLispNode(task);
                     throw task.getReporter().error(root, TEST_MESSAGE_SEMANTIC_ERROR);
-                };
-            case "":
-                return DummyLanguageModule::readLispNode;
-            default:
-                throw AssertionUtil.shouldNotReachHere("");
-            }
+                }
+                case "":
+                    return DummyLanguageModule.readLispNode(task);
+                default:
+                    throw AssertionUtil.shouldNotReachHere("");
+                }
+            };
         }
     }
 
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTokenizer.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTokenizer.java
index 7efaff1b94..e7fad1cbe9 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTokenizer.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTokenizer.java
@@ -24,18 +24,18 @@ public class HtmlTokenizer implements Tokenizer {
     @Override
     public void tokenize(SourceCode sourceCode, Tokens tokenEntries) {
         HtmlLanguageModule html = HtmlLanguageModule.getInstance();
-        TextFile tf = TextFile.forCharSeq(
-            sourceCode.getCodeBuffer(),
-            sourceCode.getFileName(),
-            html.getDefaultVersion()
-        );
 
         try (LanguageProcessor processor = html.createProcessor(html.newPropertyBundle());
+             TextFile tf = TextFile.forCharSeq(
+                 sourceCode.getCodeBuffer(),
+                 sourceCode.getFileName(),
+                 html.getDefaultVersion()
+             );
              TextDocument textDoc = TextDocument.create(tf)) {
 
             ParserTask task = new ParserTask(
                 textDoc,
-                SemanticErrorReporter.noop(), // fixme
+                SemanticErrorReporter.noop(),
                 LanguageProcessorRegistry.singleton(processor)
             );
 
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaParser.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaParser.java
index 9005056eaa..298279c679 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaParser.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaParser.java
@@ -4,6 +4,7 @@
 
 package net.sourceforge.pmd.lang.java.ast;
 
+import net.sourceforge.pmd.lang.LanguageVersion;
 import net.sourceforge.pmd.lang.ast.AstInfo;
 import net.sourceforge.pmd.lang.ast.CharStream;
 import net.sourceforge.pmd.lang.ast.ParseException;
@@ -12,8 +13,10 @@ import net.sourceforge.pmd.lang.ast.impl.javacc.JavaccTokenDocument;
 import net.sourceforge.pmd.lang.ast.impl.javacc.JjtreeParserAdapter;
 import net.sourceforge.pmd.lang.document.TextDocument;
 import net.sourceforge.pmd.lang.java.ast.internal.LanguageLevelChecker;
+import net.sourceforge.pmd.lang.java.ast.internal.ReportingStrategy;
 import net.sourceforge.pmd.lang.java.internal.JavaAstProcessor;
 import net.sourceforge.pmd.lang.java.internal.JavaLanguageProcessor;
+import net.sourceforge.pmd.lang.java.internal.JavaLanguageProperties;
 
 /**
  * Adapter for the JavaParser, using the specified grammar version.
@@ -23,16 +26,13 @@ import net.sourceforge.pmd.lang.java.internal.JavaLanguageProcessor;
  */
 public class JavaParser extends JjtreeParserAdapter<ASTCompilationUnit> {
 
-    private final LanguageLevelChecker<?> checker;
     private final String suppressMarker;
     private final JavaLanguageProcessor javaProcessor;
     private final boolean postProcess;
 
-    public JavaParser(LanguageLevelChecker<?> checker,
-                      String suppressMarker,
+    public JavaParser(String suppressMarker,
                       JavaLanguageProcessor javaProcessor,
                       boolean postProcess) {
-        this.checker = checker;
         this.suppressMarker = suppressMarker;
         this.javaProcessor = javaProcessor;
         this.postProcess = postProcess;
@@ -51,18 +51,29 @@ public class JavaParser extends JjtreeParserAdapter<ASTCompilationUnit> {
 
     @Override
     protected ASTCompilationUnit parseImpl(CharStream cs, ParserTask task) throws ParseException {
+
+        LanguageVersion version = task.getLanguageVersion();
+        int jdkVersion = JavaLanguageProperties.getInternalJdkVersion(version);
+        boolean preview = JavaLanguageProperties.isPreviewEnabled(version);
+
         JavaParserImpl parser = new JavaParserImpl(cs);
         parser.setSuppressMarker(suppressMarker);
-        parser.setJdkVersion(checker.getJdkVersion());
-        parser.setPreview(checker.isPreviewEnabled());
+        parser.setJdkVersion(jdkVersion);
+        parser.setPreview(preview);
 
         ASTCompilationUnit root = parser.CompilationUnit();
         root.setAstInfo(new AstInfo<>(task, root, parser.getSuppressMap()));
-        checker.check(root);
+
+        LanguageLevelChecker<?> levelChecker =
+            new LanguageLevelChecker<>(jdkVersion,
+                                       preview,
+                                       // TODO change this strategy with a new lang property
+                                       ReportingStrategy.reporterThatThrows());
+
+        levelChecker.check(root);
 
         if (postProcess) {
-            JavaAstProcessor processor = JavaAstProcessor.create(javaProcessor, task.getReporter());
-            processor.process(root);
+            JavaAstProcessor.process(javaProcessor, task.getReporter(), javaProcessor.newTypeInfLogger(), root);
         }
 
         return root;
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/internal/JavaAstProcessor.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/internal/JavaAstProcessor.java
index 21d1d71b76..81269df8de 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/internal/JavaAstProcessor.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/internal/JavaAstProcessor.java
@@ -44,17 +44,20 @@ public final class JavaAstProcessor {
     private SymbolResolver symResolver;
 
     private final UnresolvedClassStore unresolvedTypes;
+    private final ASTCompilationUnit acu;
 
 
     private JavaAstProcessor(JavaLanguageProcessor globalProc,
                              SemanticErrorReporter logger,
-                             TypeInferenceLogger typeInfLogger) {
+                             TypeInferenceLogger typeInfLogger,
+                             ASTCompilationUnit acu) {
 
         this.symResolver = globalProc.getTypeSystem().bootstrapResolver();
         this.globalProc = globalProc;
         this.logger = logger;
         this.typeInferenceLogger = typeInfLogger;
         this.unresolvedTypes = new UnresolvedClassStore(globalProc.getTypeSystem());
+        this.acu = acu;
     }
 
     public UnresolvedClassStore getUnresolvedStore() {
@@ -109,13 +112,13 @@ public final class JavaAstProcessor {
     }
 
     public int getJdkVersion() {
-        return globalProc.getProperties().getInternalJdkVersion();
+        return JavaLanguageProperties.getInternalJdkVersion(acu.getLanguageVersion());
     }
 
     /**
      * Performs semantic analysis on the given source file.
      */
-    public void process(ASTCompilationUnit acu) {
+    public void process() {
 
         SymbolResolver knownSyms = TimeTracker.bench("1. Symbol resolution", () -> SymbolResolutionPass.traverse(this, acu));
 
@@ -139,19 +142,19 @@ public final class JavaAstProcessor {
     }
 
 
-    public static JavaAstProcessor create(JavaLanguageProcessor globalProcessor,
+    public static void process(JavaLanguageProcessor globalProcessor,
                                           SemanticErrorReporter semanticErrorReporter,
-                                          TypeInferenceLogger typeInfLogger) {
+                                          TypeInferenceLogger typeInfLogger,
+                                           ASTCompilationUnit ast) {
 
 
-        return new JavaAstProcessor(
+        JavaAstProcessor astProc = new JavaAstProcessor(
             globalProcessor,
             semanticErrorReporter,
-            typeInfLogger
+            typeInfLogger,
+            ast
         );
-    }
 
-    public static JavaAstProcessor create(JavaLanguageProcessor globalProcessor, SemanticErrorReporter reporter) {
-        return create(globalProcessor, reporter, globalProcessor.newTypeInfLogger());
+        astProc.process();
     }
 }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/internal/JavaLanguageProcessor.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/internal/JavaLanguageProcessor.java
index c9395509c6..ab228819ce 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/internal/JavaLanguageProcessor.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/internal/JavaLanguageProcessor.java
@@ -6,13 +6,9 @@ package net.sourceforge.pmd.lang.java.internal;
 
 import java.util.Objects;
 
-import net.sourceforge.pmd.processor.BatchLanguageProcessor;
-import net.sourceforge.pmd.lang.LanguageVersion;
 import net.sourceforge.pmd.lang.LanguageVersionHandler;
 import net.sourceforge.pmd.lang.ast.Parser;
 import net.sourceforge.pmd.lang.java.ast.JavaParser;
-import net.sourceforge.pmd.lang.java.ast.internal.LanguageLevelChecker;
-import net.sourceforge.pmd.lang.java.ast.internal.ReportingStrategy;
 import net.sourceforge.pmd.lang.java.internal.JavaLanguageProperties.InferenceLoggingVerbosity;
 import net.sourceforge.pmd.lang.java.rule.internal.JavaRuleViolationFactory;
 import net.sourceforge.pmd.lang.java.rule.xpath.internal.BaseContextNodeTestFun;
@@ -28,6 +24,7 @@ import net.sourceforge.pmd.lang.java.types.internal.infer.TypeInferenceLogger.Ve
 import net.sourceforge.pmd.lang.metrics.LanguageMetricsProvider;
 import net.sourceforge.pmd.lang.rule.RuleViolationFactory;
 import net.sourceforge.pmd.lang.rule.xpath.impl.XPathHandler;
+import net.sourceforge.pmd.processor.BatchLanguageProcessor;
 import net.sourceforge.pmd.util.designerbindings.DesignerBindings;
 
 /**
@@ -45,15 +42,9 @@ public class JavaLanguageProcessor extends BatchLanguageProcessor<JavaLanguagePr
         super(properties);
         this.typeSystem = typeSystem;
 
-        LanguageLevelChecker<?> levelChecker =
-            new LanguageLevelChecker<>(properties.getInternalJdkVersion(),
-                                       properties.isPreviewEnabled(),
-                                       // TODO change this strategy with a new lang property
-                                       ReportingStrategy.reporterThatThrows());
-
         String suppressMarker = properties.getSuppressMarker();
-        this.parser = new JavaParser(levelChecker, suppressMarker, this, true);
-        this.parserWithoutProcessing = new JavaParser(levelChecker, suppressMarker, this, false);
+        this.parser = new JavaParser(suppressMarker, this, true);
+        this.parserWithoutProcessing = new JavaParser(suppressMarker, this, false);
     }
 
     public JavaLanguageProcessor(JavaLanguageProperties properties) {
@@ -66,10 +57,6 @@ public class JavaLanguageProcessor extends BatchLanguageProcessor<JavaLanguagePr
         return this;
     }
 
-    public LanguageVersion getLanguageVersion(){
-        return getProperties().getLanguageVersion();
-    }
-
     @Override
     public Parser getParser() {
         return parser;
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/internal/JavaLanguageProperties.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/internal/JavaLanguageProperties.java
index 267386983d..31e09cf556 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/internal/JavaLanguageProperties.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/internal/JavaLanguageProperties.java
@@ -29,15 +29,14 @@ public class JavaLanguageProperties extends JvmLanguagePropertyBundle {
         definePropertyDescriptor(INTERNAL_INFERENCE_LOGGING_VERBOSITY);
     }
 
-    boolean isPreviewEnabled() {
-        return getLanguageVersion().getVersion().endsWith("-preview");
+    public static boolean isPreviewEnabled(LanguageVersion version) {
+        return version.getVersion().endsWith("-preview");
     }
 
-    int getInternalJdkVersion() {
+    public static int getInternalJdkVersion(LanguageVersion version) {
         // Todo that's ugly..
-        LanguageVersion version = getLanguageVersion();
         String verString = version.getVersion();
-        if (isPreviewEnabled()) {
+        if (isPreviewEnabled(version)) {
             verString = verString.substring(0, verString.length() - "-preview".length());
         }
         if (verString.startsWith("1.")) {
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/cli/CLITest.java b/pmd-java/src/test/java/net/sourceforge/pmd/cli/CLITest.java
index da1ca356c1..5f9afad557 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/cli/CLITest.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/cli/CLITest.java
@@ -67,6 +67,7 @@ public class CLITest extends BaseCLITest {
     public void changeJavaVersion() {
         String[] args = { "-d", SOURCE_FOLDER, "-f", "text", "-R", RSET_NO_VIOLATION, "-version", "1.5", "-language", "java", "--debug", "--no-progress", };
         String log = runTest(args);
+        assertThat(log, containsString(".java (lang: java 1.5)"));
         assertThat(log, containsPattern("Adding file .*\\.java \\(lang: java 1\\.5\\)"));
     }
 
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/JavaParsingHelper.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/JavaParsingHelper.java
index eed5804085..3b3b98c996 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/JavaParsingHelper.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/JavaParsingHelper.java
@@ -74,8 +74,7 @@ public class JavaParsingHelper extends BaseParsingHelper<JavaParsingHelper, ASTC
         JavaParser parser = proc.getParserWithoutProcessing();
         ASTCompilationUnit rootNode = parser.parse(task);
         if (params.getDoProcess()) {
-            JavaAstProcessor astProc = JavaAstProcessor.create(proc, semanticLogger, typeInfLogger);
-            astProc.process(rootNode);
+            JavaAstProcessor.process(proc, semanticLogger, typeInfLogger, rootNode);
         }
         return rootNode;
     }
diff --git a/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ScalaLanguageHandler.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ScalaLanguageHandler.java
index 7f3d055f3b..608a234b86 100644
--- a/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ScalaLanguageHandler.java
+++ b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ScalaLanguageHandler.java
@@ -7,37 +7,17 @@ package net.sourceforge.pmd.lang.scala;
 import net.sourceforge.pmd.lang.AbstractPmdLanguageVersionHandler;
 import net.sourceforge.pmd.lang.scala.ast.ScalaParser;
 
-import scala.meta.Dialect;
-
 /**
  * The Scala Language Handler implementation.
  */
 public class ScalaLanguageHandler extends AbstractPmdLanguageVersionHandler {
 
-    private final Dialect dialect;
-
-    /**
-     * Create the Language Handler using the given Scala Dialect.
-     *
-     * @param scalaDialect
-     *            the language version to use while parsing etc
-     */
-    public ScalaLanguageHandler(Dialect scalaDialect) {
-        this.dialect = scalaDialect;
-    }
-
-    /**
-     * Get the Scala Dialect used in this language version choice.
-     *
-     * @return the Scala Dialect for this handler
-     */
-    public Dialect getDialect() {
-        return this.dialect;
+    public ScalaLanguageHandler() {
     }
 
 
     @Override
     public ScalaParser getParser() {
-        return new ScalaParser(dialect);
+        return new ScalaParser();
     }
 }
diff --git a/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ScalaLanguageModule.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ScalaLanguageModule.java
index 30651eb189..dfeac13f51 100644
--- a/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ScalaLanguageModule.java
+++ b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ScalaLanguageModule.java
@@ -52,9 +52,7 @@ public class ScalaLanguageModule extends LanguageModuleBase {
 
     @Override
     public LanguageProcessor createProcessor(LanguagePropertyBundle bundle) {
-        return new SimpleBatchLanguageProcessor(
-            bundle,
-            new ScalaLanguageHandler(dialectOf(bundle.getLanguageVersion())));
+        return new SimpleBatchLanguageProcessor(bundle, new ScalaLanguageHandler());
     }
 
     public static ScalaLanguageModule getInstance() {
diff --git a/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaParser.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaParser.java
index 6fefec315f..d99b34f6d5 100644
--- a/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaParser.java
+++ b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaParser.java
@@ -6,6 +6,7 @@ package net.sourceforge.pmd.lang.scala.ast;
 
 import net.sourceforge.pmd.lang.ast.ParseException;
 import net.sourceforge.pmd.lang.ast.Parser;
+import net.sourceforge.pmd.lang.scala.ScalaLanguageModule;
 
 import scala.meta.Dialect;
 import scala.meta.Source;
@@ -18,7 +19,6 @@ import scala.meta.internal.parsers.ScalametaParser;
  * for compatibility.
  */
 public final class ScalaParser implements Parser {
-    private final Dialect dialect;
 
     /**
      * Create a parser using the given Scala Dialect and set of parser options.
@@ -26,13 +26,13 @@ public final class ScalaParser implements Parser {
      * @param scalaDialect
      *            the Scala Dialect for this parser
      */
-    public ScalaParser(Dialect scalaDialect) {
-        this.dialect = scalaDialect;
+    public ScalaParser() {
     }
 
     @Override
     public ASTSource parse(ParserTask task) throws ParseException {
         Input.VirtualFile virtualFile = new Input.VirtualFile(task.getFileDisplayName(), task.getSourceText());
+        Dialect dialect = ScalaLanguageModule.dialectOf(task.getLanguageVersion());
         Source src = new ScalametaParser(virtualFile, dialect).parseSource();
         ASTSource root = (ASTSource) new ScalaTreeBuilder().build(src);
         root.addTaskInfo(task);
diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ApexClassPropertyTypes.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ApexClassPropertyTypes.java
index 1a8b5b00d8..06bf9e1091 100644
--- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ApexClassPropertyTypes.java
+++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ApexClassPropertyTypes.java
@@ -76,8 +76,6 @@ class ApexClassPropertyTypes extends SalesforceFieldTypes {
     }
 
     Node parseApex(Path apexFilePath) {
-
-        // TODO to remove that, we need to make sure there is a started LanguageProcessor for Apex and fetch it.
         LanguageVersion languageVersion = apexProcessor.getProperties().getLanguageVersion();
         try (TextFile file = TextFile.forPath(apexFilePath, StandardCharsets.UTF_8, languageVersion);
              TextDocument textDocument = TextDocument.create(file)) {